Commit Graph
12 Commits
Author SHA1 Message Date
PBS2H20ARE 4c94cadf11 Merge branch 'merge' into Comments
# Conflicts:
#	client/app/src/main/java/customUI/Button.java
#	client/app/src/main/java/customUI/Converter.java
#	client/app/src/main/java/customUI/Label.java
#	client/app/src/main/java/customUI/Tooltip.java
#	client/app/src/main/java/events/EditEventController.java
#	client/app/src/main/java/helper/SvgBtnCreator.java
#	client/app/src/main/java/main/MainController.java
#	client/data/src/main/java/container/Event.java
#	client/data/src/main/java/res/DataController.java
#	client/data/src/main/java/res/HttpRequest.java
2022-02-07 10:40:53 +01:00
PBS2H20ARE 898054bb63 Comments all Files with Creator name 2022-01-25 11:14:16 +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