Commit Graph
14 Commits
Author SHA1 Message Date
PBS2H20ARE 58fc25c27e Bugfix create-user 2022-01-31 13:32:18 +01:00
PBS2H20ARE 65d96bbd81 Merge branch 'merge' into 1800-UI-User-bearbeiten 2022-01-31 12:43:25 +01:00
PBS2H20ARE 3f41005d84 Merge branch 'merge' into 1800-UI-User-bearbeiten
# Conflicts:
#	client/app/src/main/java/users/EditUserController.java
#	client/app/src/main/resources/users/edit-user.fxml
2022-01-31 12:40:03 +01:00
PBS2H20ARE 4db6bd1c66 created and completed the edit-user.fxml, css and the controller 2022-01-24 12:16:05 +01:00
PBS2H20ARE f649b618cf Merge remote-tracking branch 'origin/merge' into merge 2022-01-18 12:46:31 +01:00
PBS2H20ARE 6e6183bf38 Updated create-user, css and the controller 2022-01-18 12:45:18 +01:00
PBS2H20ARE 7c8b1fefb7 improved the createUserController.java and the create-user.fxml 2022-01-14 10:52:20 +01:00
PBS2H20ARE 226255f75a Merge branch 'merge' into 1720-UI-User-anlegen 2022-01-10 12:50:00 +01:00
PBS2H20ARE d574849407 Created create-user.fxml,create-user.css,CreateUserController.java 2022-01-10 12:44:27 +01:00
PBS2H20ARE 6a40ebfcfc improved the main view and the main-view.css 2021-11-26 13:01:08 +01:00
PBS2H20ARE 842a83af3b changed the main view and the style.css 2021-11-25 14:47:25 +01:00
PBS2H20ARE 18d5b528af added class vbox-main and main- pannel in the css 2021-11-22 13:37:46 +01:00
PBS2H20ARE 8f3042c5f9 Merge remote-tracking branch 'origin/0300-Kalender' into 0300-Kalender 2021-11-15 13:11:58 +01:00
PBS2H20ARE cb498b3062 added jackson version control 2021-11-15 13:11:12 +01:00