|
|
87fa0f9b69
|
Merge remote-tracking branch 'origin/stable' into stable
|
2023-02-06 09:59:27 +01:00 |
|
|
|
c3b47d5c36
|
From main:
Reshad Meher:
sanitized c46eff1dda
|
2023-02-06 09:59:09 +01:00 |
|
|
|
58f61a71c2
|
Fenstergröße login, signUp, parentView, workerView angepasst
|
2023-02-06 09:41:54 +01:00 |
|
|
|
7b7889fee4
|
Merge remote-tracking branch 'origin/stable' into stable
|
2023-02-06 09:35:18 +01:00 |
|
|
|
a4ce206ec4
|
loginview, signupview angepasst. Fenstergröße angepasst
|
2023-02-06 09:34:17 +01:00 |
|
|
|
a03a294260
|
fixed childview
|
2023-02-06 09:30:13 +01:00 |
|
|
|
a7b192f256
|
SignUp View, LoginView, ParentMenueView, WorkerMenueView angepasst
|
2023-02-06 08:43:36 +01:00 |
|
pbs2h21asc
|
3a2288f8c8
|
Merge remote-tracking branch 'origin/stable' into stable
# Conflicts:
# src/main/resources/com/bib/essensbestellungsverwaltung/child-view.fxml
|
2023-02-05 21:41:33 +01:00 |
|
pbs2h21asc
|
6ca54aa026
|
singup mit Datebase verbunden und new Adresse
|
2023-02-05 21:38:27 +01:00 |
|
|
|
6fc28a0827
|
From main:
Reshad Meher:
sanitized 7932c7e896
|
2023-02-05 21:19:21 +01:00 |
|
|
|
13bc9ae1dd
|
Merge pull request 'feat/kindErstellen' (#9) from feat/kindErstellen into stable
Reviewed-on: #9
|
2023-02-05 20:40:12 +01:00 |
|
Johannes Kantz
|
f64dc7751f
|
fix: tagesbestellung locked foodplan
|
2023-02-05 20:20:58 +01:00 |
|
Johannes Kantz
|
30cc971aa2
|
fix: menu button selected
|
2023-02-05 08:59:29 +01:00 |
|
Johannes Kantz
|
2475547787
|
fix: logout
|
2023-02-05 08:58:34 +01:00 |
|
Johannes Kantz
|
166e516c67
|
readme test accounts
|
2023-02-05 08:49:21 +01:00 |
|
Johannes Kantz
|
57b5301208
|
add: ein paar mehr Beispieldaten
|
2023-02-05 08:44:19 +01:00 |
|
Johannes Kantz
|
1dadd23ffb
|
fix: remove print
|
2023-02-05 08:38:40 +01:00 |
|
Johannes Kantz
|
941e76e05b
|
fix: remove TODO
|
2023-02-04 21:58:10 +01:00 |
|
Johannes Kantz
|
b66cb3e9bc
|
add: orderHistory
|
2023-02-04 21:52:48 +01:00 |
|
Johannes Kantz
|
c4e720b9f3
|
add: some example Data
|
2023-02-04 21:52:35 +01:00 |
|
Johannes Kantz
|
47905bc8d0
|
add: create Food with allergies
|
2023-02-04 20:04:26 +01:00 |
|
Johannes Kantz
|
c49d3cb699
|
add: simple dailyOrder view
|
2023-02-04 19:53:40 +01:00 |
|
Johannes Kantz
|
e33e3d8ccb
|
fix: invoice gitignore
|
2023-02-04 19:24:46 +01:00 |
|
Johannes Kantz
|
4c9a3343d2
|
add: export invoice to txt
|
2023-02-04 19:24:08 +01:00 |
|
Johannes Kantz
|
745eddea31
|
add: select child for invoice and show total
|
2023-02-04 19:07:14 +01:00 |
|
Johannes Kantz
|
cd8e4c9b3d
|
add: create worker account on first launch
|
2023-02-04 18:49:22 +01:00 |
|
Johannes Kantz
|
b37cd2ad38
|
add: create and edit children
|
2023-02-04 18:32:19 +01:00 |
|
Johannes Kantz
|
5f5480bf5c
|
fix: Error messages
|
2023-02-04 18:31:22 +01:00 |
|
Johannes Kantz
|
07050a5809
|
fix: show only vegan food in vegan food dropdown
|
2023-02-04 18:31:08 +01:00 |
|
Johannes Kantz
|
944ddbff60
|
add: child methods
|
2023-02-04 18:30:14 +01:00 |
|
Johannes Kantz
|
7534df3263
|
fix: update query quotes
|
2023-02-04 18:29:26 +01:00 |
|
Johannes Kantz
|
9d3e035a20
|
add: ControlsFX
|
2023-02-04 18:28:48 +01:00 |
|
Johannes Kantz
|
e87c7b480a
|
fix: scene Change
|
2023-02-04 18:28:31 +01:00 |
|
Johannes Kantz
|
681f039b5c
|
add: ControlsFX
|
2023-02-04 18:28:09 +01:00 |
|
|
|
0fed0fb12b
|
From main:
Reshad Meher:
sanitized b15b94e579
|
2023-02-03 12:32:45 +01:00 |
|
|
|
dbe98686bd
|
minimal changes
|
2023-02-02 16:23:56 +01:00 |
|
|
|
106b97e105
|
set "password" for cli
|
2023-02-02 15:21:14 +01:00 |
|
|
|
d2df46eaa6
|
moving currentUser to AccountMgr
moving to stable:
Reshad Meher:
login
|
2023-02-01 23:05:24 +01:00 |
|
|
|
3643f44afb
|
Merge remote-tracking branch 'origin/stable' into stable
|
2023-02-01 22:52:26 +01:00 |
|
|
|
c022d68b92
|
Kommentare 2: electric boogaloo
|
2023-02-01 22:52:04 +01:00 |
|
|
|
b9101e4a55
|
moving commit to stable:
Richard Reiswich:
6e60fb1517
0a7f941d61
28dc4a7ab
9d7b981c22
|
2023-02-01 22:49:35 +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 |
|
|
|
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 |
|
|
|
636ac5ed3a
|
Merge pull request 'feat/menus' (#7) from feat/menus into main
Reviewed-on: #7
|
2023-01-31 10:31:15 +01:00 |
|
Johannes Kantz
|
1c85261c7b
|
add: change Scenes
|
2023-01-31 07:41:21 +01:00 |
|
