Commit Graph

Select branches

Hide Pull Requests

Richards_Branch

feat/essensplanErstellen

feat/kindErstellen

main

stable

#1

#2

#3

#4

#5

#6

#7

#8

#9

Mono Color

• 02b578a7ce Merge remote-tracking branch 'origin/stable' into stable stable richard 2023-02-06 10:02:24 +0100
• 04285ed7b7 MenueController richard 2023-02-06 10:01:00 +0100
• 87fa0f9b69 Merge remote-tracking branch 'origin/stable' into stable Malte Schulze Hobeling 2023-02-06 09:59:27 +0100
• c3b47d5c36 From main: Reshad Meher: sanitized c46eff1dda Malte Schulze Hobeling 2023-02-06 09:59:09 +0100
• 58f61a71c2 Fenstergröße login, signUp, parentView, workerView angepasst richard 2023-02-06 09:41:54 +0100
• 7b7889fee4 Merge remote-tracking branch 'origin/stable' into stable richard 2023-02-06 09:35:18 +0100
• a4ce206ec4 loginview, signupview angepasst. Fenstergröße angepasst richard 2023-02-06 09:34:17 +0100
• a03a294260 fixed childview Malte Schulze Hobeling 2023-02-06 09:30:13 +0100
• a7b192f256 SignUp View, LoginView, ParentMenueView, WorkerMenueView angepasst richard 2023-02-06 08:43:36 +0100
• c46eff1dda NutzerEinstellung: passwort akuelliseren, Adressse aktuelliseren main Reshad Meher 2023-02-06 03:23:27 +0100
• 3a2288f8c8 Merge remote-tracking branch 'origin/stable' into stable pbs2h21asc 2023-02-05 21:41:33 +0100
• 6ca54aa026 singup mit Datebase verbunden und new Adresse pbs2h21asc 2023-02-05 21:38:27 +0100
• 6fc28a0827 From main: Reshad Meher: sanitized 7932c7e896 Malte Schulze Hobeling 2023-02-05 21:19:21 +0100
• 13bc9ae1dd Merge pull request 'feat/kindErstellen' (#9) from feat/kindErstellen into stable Malte Schulze Hobeling 2023-02-05 20:40:12 +0100
• f64dc7751f fix: tagesbestellung locked foodplan feat/kindErstellen Johannes Kantz 2023-02-05 20:20:58 +0100
• 20a39be10b Variablen und Attributen auf englisch umbennent Reshad Meher 2023-02-05 15:17:51 +0100
• d457b20f15 Merge remote-tracking branch 'origin/main' Reshad Meher 2023-02-05 15:12:48 +0100
• 634d1ce805 test Reshad Meher 2023-02-01 10:04:35 +0100
• a9dede0974 Variablen und Attributen auf englisch umbennent Reshad Meher 2023-02-05 15:11:42 +0100
• 7932c7e896 Variablen und Attributen auf englisch umbennent Reshad Meher 2023-02-05 15:11:32 +0100
• 30cc971aa2 fix: menu button selected Johannes Kantz 2023-02-05 08:59:29 +0100
• 2475547787 fix: logout Johannes Kantz 2023-02-05 08:58:34 +0100
• 166e516c67 readme test accounts Johannes Kantz 2023-02-05 08:49:21 +0100
• 57b5301208 add: ein paar mehr Beispieldaten Johannes Kantz 2023-02-05 08:44:19 +0100
• 1dadd23ffb fix: remove print Johannes Kantz 2023-02-05 08:38:40 +0100
• 941e76e05b fix: remove TODO Johannes Kantz 2023-02-04 21:58:10 +0100
• b66cb3e9bc add: orderHistory Johannes Kantz 2023-02-04 21:52:48 +0100
• c4e720b9f3 add: some example Data Johannes Kantz 2023-02-04 21:52:35 +0100
• 47905bc8d0 add: create Food with allergies Johannes Kantz 2023-02-04 20:04:26 +0100
• c49d3cb699 add: simple dailyOrder view Johannes Kantz 2023-02-04 19:53:40 +0100
• e33e3d8ccb fix: invoice gitignore Johannes Kantz 2023-02-04 19:24:46 +0100
• 4c9a3343d2 add: export invoice to txt Johannes Kantz 2023-02-04 19:24:08 +0100
• 745eddea31 add: select child for invoice and show total Johannes Kantz 2023-02-04 19:07:14 +0100
• cd8e4c9b3d add: create worker account on first launch Johannes Kantz 2023-02-04 18:49:22 +0100
• b37cd2ad38 add: create and edit children Johannes Kantz 2023-02-04 18:32:19 +0100
• 5f5480bf5c fix: Error messages Johannes Kantz 2023-02-04 18:31:22 +0100
• 07050a5809 fix: show only vegan food in vegan food dropdown Johannes Kantz 2023-02-04 18:31:08 +0100
• 944ddbff60 add: child methods Johannes Kantz 2023-02-04 18:30:14 +0100
• 7534df3263 fix: update query quotes Johannes Kantz 2023-02-04 18:29:26 +0100
• 9d3e035a20 add: ControlsFX Johannes Kantz 2023-02-04 18:28:48 +0100
• e87c7b480a fix: scene Change Johannes Kantz 2023-02-04 18:28:31 +0100
• 681f039b5c add: ControlsFX Johannes Kantz 2023-02-04 18:28:09 +0100
• a23a1695ad „readme.md“ ändern Malte Schulze Hobeling 2023-02-03 14:51:01 +0100
• 0fed0fb12b From main: Reshad Meher: sanitized b15b94e579 Malte Schulze Hobeling 2023-02-03 12:32:45 +0100
• dbe98686bd minimal changes Malte Schulze Hobeling 2023-02-02 16:23:56 +0100
• 106b97e105 set "password" for cli Malte Schulze Hobeling 2023-02-02 15:21:14 +0100
• d2df46eaa6 moving currentUser to AccountMgr Malte Schulze Hobeling 2023-02-01 23:05:24 +0100
• 3643f44afb Merge remote-tracking branch 'origin/stable' into stable Malte Schulze Hobeling 2023-02-01 22:52:26 +0100
• c022d68b92 Kommentare 2: electric boogaloo Malte Schulze Hobeling 2023-02-01 22:52:04 +0100
• b9101e4a55 moving commit to stable: Richard Reiswich: 6e60fb1517 0a7f941d61 28dc4a7ab 9d7b981c22 Malte Schulze Hobeling 2023-02-01 22:49:35 +0100
• ba70f484a7 Kommentare 2: electric boogaloo Malte Schulze Hobeling 2023-02-01 21:33:53 +0100
• 9d7b981c22 MenueController Button highlight Richard 2023-02-01 18:32:56 +0100
• 28dcd4a7ab MenueController Button highlight Richard 2023-02-01 18:23:19 +0100
• 3ca6aa017a MenueController Button highlight Richards_Branch Richard 2023-02-01 18:21:40 +0100
• f5ca04983c MenueController Button highlight Richard 2023-02-01 18:20:22 +0100
• 0a7f941d61 Merge remote-tracking branch 'origin/main' Richard 2023-02-01 18:18:39 +0100
• 6e60fb1517 MenueController Button highlight Richard 2023-02-01 18:17:44 +0100
• 646d63c6c0 Merge remote-tracking branch 'origin/Richards_Branch' into Richards_Branch Richard 2023-02-01 17:46:17 +0100
• e4eb47aa05 MenueController Button highlight Richard 2023-02-01 17:46:04 +0100
• ba3b92b3c4 MenueController Button highlight Richard 2023-02-01 17:45:40 +0100
• 6c13cb1873 fix: remove db Johannes Kantz 2023-02-01 12:03:21 +0100
• 54c3b9f3f5 New.01 richard 2023-02-01 11:59:56 +0100
• 2c387cda0d New.01 richard 2023-02-01 11:58:14 +0100
• 289617b9b7 fix: remove .idea folder Johannes Kantz 2023-02-01 11:55:54 +0100
• cd395d1982 test Reshad Meher 2023-02-01 10:04:20 +0100
• ea8beb9de5 fix: remove debug print Johannes Kantz 2023-02-01 07:27:12 +0100
• b74a983d9a fix: changed window size to prevent essensplan overflow Johannes Kantz 2023-02-01 07:23:43 +0100
• 20700448af add: createFoodplan Johannes Kantz 2023-02-01 07:22:09 +0100
• 5978a079bf add: createFood Johannes Kantz 2023-02-01 07:21:59 +0100
• 56f359a63a add: database.db to gitignore Johannes Kantz 2023-02-01 07:21:37 +0100
• d02acb89a4 add: change Scenes Johannes Kantz 2023-01-31 07:41:21 +0100
• c08b0aece5 fix: refactor Johannes Kantz 2023-01-31 07:18:37 +0100
• 4d6c2043d7 fix: changed window size Johannes Kantz 2023-01-31 07:03:11 +0100
• 6555f8f8bc add: Rechnung View Johannes Kantz 2023-01-31 06:01:53 +0100
• 4559ad5036 add: workerMenu Johannes Kantz 2023-01-31 04:30:25 +0100
• 63d1030c7f add: parent menu Johannes Kantz 2023-01-31 04:30:09 +0100
• 846c2c392a singup mit Datebase verbunden und new Adresse Reshad Meher 2023-02-01 09:48:55 +0100
• 40cc2b002a test Reshad Meher 2023-02-01 10:04:35 +0100
• e87bae35bc test Reshad Meher 2023-02-01 10:04:20 +0100
• 0b02c1c661 Merge remote-tracking branch 'origin/main' Reshad Meher 2023-02-01 09:53:51 +0100
• b15b94e579 singup mit Datebase verbunden und new Adresse Reshad Meher 2023-02-01 09:48:55 +0100
• 0d36d7718e Merge pull request 'feat/essensplanErstellen' (#8) from feat/essensplanErstellen into main Malte Schulze Hobeling 2023-02-01 09:38:30 +0100
• 3613e246c9 MenueController Button highlight Richard 2023-02-01 09:27:34 +0100
• b7bc440a4f MenueController Button highlight Richard 2023-02-01 09:25:40 +0100
• 9b6d60a571 fix: remove debug print feat/essensplanErstellen Johannes Kantz 2023-02-01 07:27:12 +0100
• f567320ec3 fix: changed window size to prevent essensplan overflow Johannes Kantz 2023-02-01 07:23:43 +0100
• 324ce53bd4 add: createFoodplan Johannes Kantz 2023-02-01 07:22:09 +0100
• f71aba3505 add: createFood Johannes Kantz 2023-02-01 07:21:59 +0100
• 5ee0288736 add: database.db to gitignore Johannes Kantz 2023-02-01 07:21:37 +0100
• b456b6d1d8 MenueController Button highlight Richard 2023-01-31 21:26:41 +0100
• 3f3875fd78 signup Richard 2023-01-31 17:53:01 +0100
• f09d63dd21 aus main stuff kopiert Richard 2023-01-31 17:51:37 +0100
• 72c2e9da16 Childview & Elternmenue hinzugefügt richard 2023-01-31 15:38:08 +0100
• 8927755462 Admin Controller pbs2h21asc 2023-01-31 14:34:37 +0100
• 2814244d29 Merge remote-tracking branch 'origin/Richards_Branch' into Richards_Branch pbs2h21asc 2023-01-31 12:27:59 +0100
• 1a9f13581e Admin Controller bearbeitet pbs2h21asc 2023-01-31 12:27:14 +0100
• 636ac5ed3a Merge pull request 'feat/menus' (#7) from feat/menus into main Johannes Kantz 2023-01-31 10:31:15 +0100
• 6747188668 settingsview & Controller erstellt richard 2023-01-31 10:22:48 +0100
• 1c85261c7b add: change Scenes Johannes Kantz 2023-01-31 07:41:21 +0100
• c57e65fadb fix: refactor Johannes Kantz 2023-01-31 07:18:37 +0100