Compare commits
No commits in common. "master" and "merge" have entirely different histories.
@ -91,7 +91,7 @@ public class CreateEventController {
|
||||
dataController.createEvent(event);
|
||||
}
|
||||
|
||||
//Marco Kühn//
|
||||
//Marc Beyer//
|
||||
@FXML
|
||||
protected void abortBtnClick(ActionEvent event) {
|
||||
Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
|
||||
|
@ -1,4 +1,3 @@
|
||||
//Marc Beyer//
|
||||
package events;
|
||||
|
||||
import helper.HttpRequestException;
|
||||
|
@ -1,4 +1,4 @@
|
||||
// Marco Kühn, Marc Beyer //
|
||||
/* Marco Kühn, Marc Beyer */
|
||||
package main;
|
||||
|
||||
import config.Config;
|
||||
|
@ -1,4 +1,4 @@
|
||||
// Marco Kühn //
|
||||
/* Marco Kühn */
|
||||
package main;
|
||||
|
||||
import com.jfoenix.controls.*;
|
||||
|
@ -1,4 +1,3 @@
|
||||
//Marc Beyer//
|
||||
package ui;
|
||||
|
||||
import javafx.scene.control.Label;
|
||||
|
@ -1,4 +1,3 @@
|
||||
//Marc Beyer, Marco Kühn//
|
||||
package ui;
|
||||
|
||||
import container.Event;
|
||||
|
@ -1,4 +1,3 @@
|
||||
//Marco Kühn//
|
||||
package ui;
|
||||
|
||||
import javafx.geometry.Bounds;
|
||||
|
@ -1,4 +1,4 @@
|
||||
// Marc Beyer //
|
||||
/* Marc Beyer */
|
||||
package users;
|
||||
|
||||
import container.DataController;
|
||||
|
@ -6,7 +6,7 @@
|
||||
|
||||
-fx-bright-border-color: #B0B0B0;
|
||||
|
||||
-fx-bright-text-color: #ff5555;
|
||||
-fx-bright-text-color: ##ff5555;
|
||||
-fx-brighter-text-color: #ffffff;
|
||||
}
|
||||
|
||||
|
@ -26,7 +26,7 @@
|
||||
<JFXTextField styleClass="userField" GridPane.columnIndex="1" GridPane.rowIndex="1" fx:id="userField"/>
|
||||
<Label styleClass="errorLbl" GridPane.columnIndex="2" GridPane.rowIndex="1" fx:id="userErrLabel"/>
|
||||
|
||||
<Label GridPane.rowIndex="2">Passwort</Label>
|
||||
<Label GridPane.rowIndex="2">Paswort</Label>
|
||||
<JFXPasswordField styleClass="passField" GridPane.columnIndex="1" GridPane.rowIndex="2" fx:id="passField"/>
|
||||
<Label styleClass="errorLbl" GridPane.columnIndex="2" GridPane.rowIndex="2" fx:id="passErrLabel"/>
|
||||
|
||||
|
@ -1,4 +1,3 @@
|
||||
//Marc Beyer//
|
||||
package container;
|
||||
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
|
@ -1,4 +1,3 @@
|
||||
//Marco Kühn//
|
||||
package container;
|
||||
|
||||
import java.time.Duration;
|
||||
|
@ -1,4 +1,3 @@
|
||||
//Marc Beyer//
|
||||
package container;
|
||||
|
||||
import helper.Tuple;
|
||||
|
@ -1,4 +1,3 @@
|
||||
//Marco Kühn//
|
||||
package container;
|
||||
|
||||
public class User {
|
||||
|
Loading…
Reference in New Issue
Block a user