Commit Graph

24 Commits

Author SHA1 Message Date
5a4a1e70e8 merged 0300 and 0120 2021-11-26 13:30:51 +01:00
dc1b1643d8 Merge branch '0300-Kalender' into merge
# Conflicts:
#	hellofx/app/build/resources/main/client/style.css
#	hellofx/app/src/main/resources/client/style.css
2021-11-26 13:25:05 +01:00
6a40ebfcfc improved the main view and the main-view.css 2021-11-26 13:01:08 +01:00
e3beeda254 improved ui 2021-11-26 08:02:47 +01:00
6fe7cb06c1 added abort button 2021-11-25 21:12:45 +01:00
2785c04d78 filled scene 'create-event' with live 2021-11-25 15:04:40 +01:00
842a83af3b changed the main view and the style.css 2021-11-25 14:47:25 +01:00
1900f83b45 created new window 2021-11-25 11:34:33 +01:00
18d5b528af added class vbox-main and main- pannel in the css 2021-11-22 13:37:46 +01:00
af3ffe807c removed buildfile 2021-11-17 21:32:04 +01:00
95de4b5985 Fixed JavaFX version waring 2021-11-15 19:04:42 +01:00
6971a42b39 changed layout 2021-11-15 15:36:13 +01:00
23be5a1b91 Merge branch '0100-Termine_anzeigen' into 0300-Kalender 2021-11-15 13:25:13 +01:00
2944c44d1d Merge remote-tracking branch 'origin/0100-Termine_anzeigen' into 0100-Termine_anzeigen
# Conflicts:
#	hellofx/app/build/resources/main/client/main-view.fxml
2021-11-15 13:22:52 +01:00
e51ef5c49d added css 2021-11-15 13:21:46 +01:00
bab5ef0a93 added css 2021-11-15 13:17:43 +01:00
8f3042c5f9 Merge remote-tracking branch 'origin/0300-Kalender' into 0300-Kalender 2021-11-15 13:11:58 +01:00
cb498b3062 added jackson version control 2021-11-15 13:11:12 +01:00
8980a95c25 fixed gitignore the third 2021-11-15 11:13:29 +01:00
0303fcf467 fixed gitignore the second 2021-11-15 11:12:45 +01:00
68275e1830 fixed gitignore the second 2021-11-15 11:10:55 +01:00
da7ff960e5 fixed gitignore 2021-11-15 11:05:25 +01:00
adae09a1e9 updated gitignore 2021-11-15 10:56:10 +01:00
96e0853d20 Complete rewrite/restructure of the project 2021-11-14 23:00:07 +01:00