|
|
d457b20f15
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# src/main/java/com/bib/essensbestellungsverwaltung/MenueController.java
# src/main/java/com/bib/essensbestellungsverwaltung/SettingsController.java
# src/main/java/com/bib/essensbestellungsverwaltung/SingUpController.java
# src/main/java/com/bib/essensbestellungsverwaltung/StartViewApplication.java
# src/main/resources/com/bib/essensbestellungsverwaltung/menue-view.fxml
# src/main/resources/com/bib/essensbestellungsverwaltung/signUp-view.fxml
|
2023-02-05 15:12:48 +01:00 |
|
|
|
634d1ce805
|
test
|
2023-02-05 15:12:21 +01:00 |
|
|
|
a9dede0974
|
Variablen und Attributen auf englisch umbennent
|
2023-02-05 15:11:42 +01:00 |
|
|
|
7932c7e896
|
Variablen und Attributen auf englisch umbennent
|
2023-02-05 15:11:32 +01:00 |
|
|
|
a23a1695ad
|
„readme.md“ ändern
|
2023-02-03 14:51:01 +01:00 |
|
|
|
ba70f484a7
|
Kommentare 2: electric boogaloo
|
2023-02-01 21:33:53 +01:00 |
|
|
|
9d7b981c22
|
MenueController Button highlight
|
2023-02-01 18:32:56 +01:00 |
|
|
|
28dcd4a7ab
|
MenueController Button highlight
|
2023-02-01 18:23:19 +01:00 |
|
|
|
0a7f941d61
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# src/main/java/com/bib/essensbestellungsverwaltung/MenueController.java
|
2023-02-01 18:18:39 +01:00 |
|
|
|
6e60fb1517
|
MenueController Button highlight
|
2023-02-01 18:17:44 +01:00 |
|
Johannes Kantz
|
6c13cb1873
|
fix: remove db
|
2023-02-01 12:03:21 +01:00 |
|
Johannes Kantz
|
289617b9b7
|
fix: remove .idea folder
|
2023-02-01 11:55:54 +01:00 |
|
|
|
cd395d1982
|
test
|
2023-02-01 10:14:17 +01:00 |
|
Johannes Kantz
|
ea8beb9de5
|
fix: remove debug print
|
2023-02-01 10:14:00 +01:00 |
|
Johannes Kantz
|
b74a983d9a
|
fix: changed window size to prevent essensplan overflow
|
2023-02-01 10:14:00 +01:00 |
|
Johannes Kantz
|
20700448af
|
add: createFoodplan
|
2023-02-01 10:14:00 +01:00 |
|
Johannes Kantz
|
5978a079bf
|
add: createFood
|
2023-02-01 10:13:57 +01:00 |
|
Johannes Kantz
|
56f359a63a
|
add: database.db to gitignore
|
2023-02-01 10:13:54 +01:00 |
|
Johannes Kantz
|
d02acb89a4
|
add: change Scenes
|
2023-02-01 10:13:38 +01:00 |
|
Johannes Kantz
|
c08b0aece5
|
fix: refactor
|
2023-02-01 10:13:29 +01:00 |
|
Johannes Kantz
|
4d6c2043d7
|
fix: changed window size
|
2023-02-01 10:13:21 +01:00 |
|
Johannes Kantz
|
6555f8f8bc
|
add: Rechnung View
|
2023-02-01 10:13:03 +01:00 |
|
Johannes Kantz
|
4559ad5036
|
add: workerMenu
|
2023-02-01 10:12:52 +01:00 |
|
Johannes Kantz
|
63d1030c7f
|
add: parent menu
|
2023-02-01 10:12:44 +01:00 |
|
|
|
846c2c392a
|
singup mit Datebase verbunden und new Adresse
|
2023-02-01 10:12:26 +01:00 |
|
|
|
40cc2b002a
|
test
|
2023-02-01 10:04:35 +01:00 |
|
|
|
e87bae35bc
|
test
|
2023-02-01 10:04:20 +01:00 |
|
|
|
0b02c1c661
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# src/main/java/com/bib/essensbestellungsverwaltung/LoginController.java
# src/main/java/com/bib/essensbestellungsverwaltung/SingUpController.java
# src/main/java/com/bib/essensbestellungsverwaltung/StartViewApplication.java
|
2023-02-01 09:53:51 +01:00 |
|
|
|
b15b94e579
|
singup mit Datebase verbunden und new Adresse
|
2023-02-01 09:48:55 +01:00 |
|
|
|
0d36d7718e
|
Merge pull request 'feat/essensplanErstellen' (#8) from feat/essensplanErstellen into main
Reviewed-on: #8
|
2023-02-01 09:38:30 +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 |
|
Johannes Kantz
|
9b6d60a571
|
fix: remove debug print
|
2023-02-01 07:27:12 +01:00 |
|
Johannes Kantz
|
f567320ec3
|
fix: changed window size to prevent essensplan overflow
|
2023-02-01 07:23:43 +01:00 |
|
Johannes Kantz
|
324ce53bd4
|
add: createFoodplan
|
2023-02-01 07:22:09 +01:00 |
|
Johannes Kantz
|
f71aba3505
|
add: createFood
|
2023-02-01 07:21:59 +01:00 |
|
Johannes Kantz
|
5ee0288736
|
add: database.db to gitignore
|
2023-02-01 07:21:37 +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 |
|
|
|
72c2e9da16
|
Childview & Elternmenue hinzugefügt
|
2023-01-31 15:38:08 +01:00 |
|
pbs2h21asc
|
8927755462
|
Admin Controller
|
2023-01-31 14:34: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 |
|
|
|
636ac5ed3a
|
Merge pull request 'feat/menus' (#7) from feat/menus into main
Reviewed-on: #7
|
2023-01-31 10:31:15 +01:00 |
|
|
|
6747188668
|
settingsview & Controller erstellt
|
2023-01-31 10:22:48 +01:00 |
|
Johannes Kantz
|
1c85261c7b
|
add: change Scenes
|
2023-01-31 07:41:21 +01:00 |
|
Johannes Kantz
|
c57e65fadb
|
fix: refactor
|
2023-01-31 07:18:37 +01:00 |
|
Johannes Kantz
|
c890819be7
|
fix: changed window size
|
2023-01-31 07:03:11 +01:00 |
|
Johannes Kantz
|
c981fbca19
|
add: Rechnung View
|
2023-01-31 06:01:53 +01:00 |
|
