| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Kantz
							
						 
					 | 
					
						
						
							
						
						2b5839f0ea
					 | 
					
						
						
							
							add: workerMenu
						
						
						
						
						
						
					 | 
					
						2023-01-31 04:30:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Kantz
							
						 
					 | 
					
						
						
							
						
						1a4d45aed4
					 | 
					
						
						
							
							add: parent menu
						
						
						
						
						
						
					 | 
					
						2023-01-31 04:30: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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a0eed3ce51
					 | 
					
						
						
							
							Food, User
						
						
						
						
						
						
					 | 
					
						2023-01-27 15:14:36 +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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e245233a23
					 | 
					
						
						
							
							fixed the mess
						
						
						
						
						
						
					 | 
					
						2023-01-17 08:47:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						074107752d
					 | 
					
						
						
							
							LoginView überarbeitet
						
						
						
						
						
						
					 | 
					
						2023-01-16 23:25:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8634df0d6d
					 | 
					
						
						
							
							LoginView überarbeitet
						
						
						
						
						
						
					 | 
					
						2023-01-16 23:09:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8ce8c027c8
					 | 
					
						
						
							
							test
						
						
						
						
						
						
					 | 
					
						2023-01-16 18:37:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1194b163fa
					 | 
					
						
						
							
							login view
						
						
						
						
						
						
						
						menue view
MenueController 
						
						
					 | 
					
						2023-01-16 18:06:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f072cc9f66
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/main'
						
						
						
						
						
						
					 | 
					
						2023-01-16 18:02:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						438d18e378
					 | 
					
						
						
							
							salz
						
						
						
						
						
						
					 | 
					
						2023-01-16 17:23:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7d0855be4e
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/main'
						
						
						
						
						
						
					 | 
					
						2023-01-16 16:58:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |