Commit Graph

85 Commits

Author SHA1 Message Date
f5ca04983c MenueController Button highlight 2023-02-01 18:20:22 +01:00
646d63c6c0 Merge remote-tracking branch 'origin/Richards_Branch' into Richards_Branch 2023-02-01 17:46:17 +01:00
e4eb47aa05 MenueController Button highlight 2023-02-01 17:46:04 +01:00
ba3b92b3c4 MenueController Button highlight 2023-02-01 17:45:40 +01:00
54c3b9f3f5 New.01 2023-02-01 11:59:56 +01:00
2c387cda0d New.01 2023-02-01 11:58:14 +01:00
3613e246c9 MenueController Button highlight 2023-02-01 09:27:34 +01:00
b7bc440a4f MenueController Button highlight 2023-02-01 09:25:40 +01:00
b456b6d1d8 MenueController Button highlight 2023-01-31 21:26:41 +01:00
3f3875fd78 signup 2023-01-31 17:53:01 +01:00
f09d63dd21 aus main stuff kopiert 2023-01-31 17:51:37 +01:00
pbs2h21asc
2814244d29 Merge remote-tracking branch 'origin/Richards_Branch' into Richards_Branch
# Conflicts:
#	src/main/resources/com/bib/essensbestellungsverwaltung/createCoworker-view.fxml
2023-01-31 12:27:59 +01:00
pbs2h21asc
1a9f13581e Admin Controller bearbeitet 2023-01-31 12:27:14 +01:00
6747188668 settingsview & Controller erstellt 2023-01-31 10:22:48 +01:00
pbs2h21asc
0550482a6b View überarbeitet
Controller AdminController anfangen
2023-01-30 15:03:54 +01:00
pbs2h21asc
6cb48af976 Merge remote-tracking branch 'origin/Richards_Branch' into Richards_Branch 2023-01-30 14:58:43 +01:00
pbs2h21asc
9e4db23e7a View überarbeitet
Controller AdminController anfangen
2023-01-30 14:57:57 +01:00
a039bb09fc „.idea/vcs.xml“ löschen 2023-01-30 14:22:23 +01:00
97af9f3792 „.idea/misc.xml“ löschen 2023-01-30 14:22:17 +01:00
2b1223b3b7 „.idea/encodings.xml“ löschen 2023-01-30 14:22:12 +01:00
7e6b1aedf3 „.idea/.gitignore“ löschen 2023-01-30 14:22:07 +01:00
464285dcbf „database.db“ löschen 2023-01-30 14:21:50 +01:00
49575add8a Merge branch 'main' into Richards_Branch 2023-01-30 14:21:09 +01:00
329acaabcb Merge pull request 'WIP_Objects' (#5) from WIP_Objects into main
Reviewed-on: #5
2023-01-30 14:14:03 +01:00
5447d7f238 Merge branch 'main' into WIP_Objects 2023-01-30 14:13:50 +01:00
e3c6513ebb „.idea/vcs.xml“ löschen 2023-01-30 14:13:10 +01:00
3f7fb06e1b „.idea/uiDesigner.xml“ löschen 2023-01-30 14:13:04 +01:00
318e1ef065 „.idea/misc.xml“ löschen 2023-01-30 14:12:59 +01:00
43a4e2aa85 „.idea/encodings.xml“ löschen 2023-01-30 14:12:54 +01:00
741b4892b8 „.idea/.gitignore“ löschen 2023-01-30 14:12:47 +01:00
50e0118ded small fix 2023-01-30 14:04:59 +01:00
2d91259953 StartViewApplication ist die Startpunkt des Projekt 2023-01-30 14:01:33 +01:00
53c603249d StartViewApplication ist die Startpunkt des Projekt 2023-01-30 14:01:19 +01:00
81bcb44d74 most Objects done 2023-01-30 04:26:30 +01:00
3c0edbc431 new Regisiteren View 2023-01-27 15:17:17 +01:00
a0eed3ce51 Food, User 2023-01-27 15:14:36 +01:00
981169d578 Merge remote-tracking branch 'origin/Richards_Branch' into Richards_Branch 2023-01-27 15:11:38 +01:00
9b73f91f5c new Regisiteren View 2023-01-27 15:11:25 +01:00
67b3637505 Views & Controller erstellt 2023-01-27 14:36:10 +01:00
c7d0514c43 Merge remote-tracking branch 'origin/Richards_Branch' into Richards_Branch 2023-01-23 09:08:32 +01:00
702677b65b neue Zustand 23.01.23 2023-01-23 09:08:03 +01:00
b97fe83f40 Merge pull request 'Richards_Branch' (#4) from Richards_Branch into main 2023-01-23 08:59:53 +01:00
27710e92af Merge branch 'main' into Richards_Branch 2023-01-23 08:59:38 +01:00
a3c3ee0fe0 Login und SingUp aktuallisiert 2023-01-18 22:32:38 +01:00
pbs2h21asc
dd69909b16 Views erstellt 2023-01-18 13:22:05 +01:00
a7bcaf13ce css + png hinzugefügt 2023-01-18 02:41:25 +01:00
f8673ca92a Views hinzugefügt 2023-01-18 02:39:17 +01:00
400ffb0e98 ParetSence 2023-01-17 22:30:56 +01:00
3bb141fb52 Views & Controller erstellt 2023-01-17 15:58:22 +01:00
ec2d3b581d fixed salt 2023-01-17 13:47:24 +01:00