| 
						
					 | 
					
						
						
							
						
						0d626bb6dc
					 | 
					
						
						
							
							Refactored create svg Buttons
						
						
						
						
						
						
					 | 
					
						2022-01-20 13:49:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						141d294b79
					 | 
					
						
						
							
							Merge branch 'Add-SVGs' into merge
						
						
						
						
						
						
					 | 
					
						2022-01-19 11:45:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2269f05f52
					 | 
					
						
						
							
							Fixed event/add endpoint
						
						
						
						
						
						
					 | 
					
						2022-01-19 00:30:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						78505097db
					 | 
					
						
						
							
							Fixed event/all and event/del endpoints
						
						
						
						
						
						
					 | 
					
						2022-01-19 00:16:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						22e7d30678
					 | 
					
						
						
							
							Fixed MainApplication the second
						
						
						
						
						
						
					 | 
					
						2022-01-18 12:56:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3c0ebd24d7
					 | 
					
						
						
							
							Fixed MainApplication
						
						
						
						
						
						
					 | 
					
						2022-01-18 12:51:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f649b618cf
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/merge' into merge
						
						
						
						
						
						
					 | 
					
						2022-01-18 12:46:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6e6183bf38
					 | 
					
						
						
							
							Updated create-user, css and the controller
						
						
						
						
						
						
					 | 
					
						2022-01-18 12:45:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0132077c62
					 | 
					
						
						
							
							Added edit and delete event svgs
						
						
						
						
						
						
					 | 
					
						2022-01-18 12:37:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5dafdf08b4
					 | 
					
						
						
							
							Fixed mainView calander nav Buttons
						
						
						
						
						
						
					 | 
					
						2022-01-18 10:00:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cf960ff6d6
					 | 
					
						
						
							
							Fixed mainView
						
						
						
						
						
						
					 | 
					
						2022-01-18 09:57:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						521b1cb2f7
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/Update-components-to-JFoenix' into Update-components-to-JFoenix
						
						
						
						
						
						
						
						# Conflicts:
#	client/app/src/main/java/main/CreateEventController.java 
						
						
					 | 
					
						2022-01-18 09:48:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a24addf6ec
					 | 
					
						
						
							
							Changed checkbox to toggleButton, refactored code
						
						
						
						
						
						
					 | 
					
						2022-01-18 09:46:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						051000169e
					 | 
					
						
						
							
							Updated login, main-wiew and the controllers
						
						
						
						
						
						
					 | 
					
						2022-01-15 09:24:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0893c4661e
					 | 
					
						
						
							
							Updated event controller
						
						
						
						
						
						
					 | 
					
						2022-01-15 09:14:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						53b631678a
					 | 
					
						
						
							
							Create/edit event uses JFonix compnents
						
						
						
						
						
						
					 | 
					
						2022-01-14 23:52:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						07c27e84d8
					 | 
					
						
						
							
							Changed create-event.fxml
						
						
						
						
						
						
					 | 
					
						2022-01-14 23:33:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0924625a0e
					 | 
					
						
						
							
							Test to change component to JFoenix
						
						
						
						
						
						
					 | 
					
						2022-01-14 21:22:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3fe16186e2
					 | 
					
						
						
							
							Improved layout, removed typ
						
						
						
						
						
						
					 | 
					
						2022-01-14 11:11:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7c8b1fefb7
					 | 
					
						
						
							
							improved the createUserController.java and the create-user.fxml
						
						
						
						
						
						
					 | 
					
						2022-01-14 10:52:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						654f34e30e
					 | 
					
						
						
							
							TimPicker now uses 24h time format
						
						
						
						
						
						
					 | 
					
						2022-01-14 10:44:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						baeed584ab
					 | 
					
						
						
							
							TimPicker now uses 24h time format
						
						
						
						
						
						
					 | 
					
						2022-01-14 10:14:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ce309581ed
					 | 
					
						
						
							
							Added TimePicker to edit event, time is used
						
						
						
						
						
						
					 | 
					
						2022-01-13 11:02:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f0405b5d86
					 | 
					
						
						
							
							Added timePicker to mainGrid
						
						
						
						
						
						
					 | 
					
						2022-01-13 10:11:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0d105be15c
					 | 
					
						
						
							
							Created TimePicker and tried to add to grid
						
						
						
						
						
						
					 | 
					
						2022-01-13 08:30:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						646da71e8a
					 | 
					
						
						
							
							Merge branch '2410-develop' into merge
						
						
						
						
						
						
						
						# Conflicts:
#	client/app/src/main/java/main/MainController.java 
						
						
					 | 
					
						2022-01-13 08:28:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						46606a5afc
					 | 
					
						
						
							
							Suppress warnings
						
						
						
						
						
						
					 | 
					
						2022-01-13 08:26:51 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b205c96f85
					 | 
					
						
						
							
							Fixed String encoding
						
						
						
						
						
						
					 | 
					
						2022-01-13 07:57:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0ef383aa7f
					 | 
					
						
						
							
							Fixed String encoding
						
						
						
						
						
						
					 | 
					
						2022-01-11 17:14:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						eb55d5c650
					 | 
					
						
						
							
							Implementet JFoenix
						
						
						
						
						
						
					 | 
					
						2022-01-11 12:13:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f933690ba0
					 | 
					
						
						
							
							Added UI to edit events
						
						
						
						
						
						
					 | 
					
						2022-01-11 07:46:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						226255f75a
					 | 
					
						
						
							
							Merge branch 'merge' into 1720-UI-User-anlegen
						
						
						
						
						
						
					 | 
					
						2022-01-10 12:50:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d574849407
					 | 
					
						
						
							
							Created create-user.fxml,create-user.css,CreateUserController.java
						
						
						
						
						
						
					 | 
					
						2022-01-10 12:44:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c754b77c81
					 | 
					
						
						
							
							Formatted code
						
						
						
						
						
						
					 | 
					
						2021-12-22 15:04:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						66edff8ed5
					 | 
					
						
						
							
							Fixed username
						
						
						
						
						
						
					 | 
					
						2021-12-21 09:46:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ded0b9042f
					 | 
					
						
						
							
							Styled login
						
						
						
						
						
						
					 | 
					
						2021-12-21 08:56:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e7b376e722
					 | 
					
						
						
							
							Fixed userId when creating an event
						
						
						
						
						
						
					 | 
					
						2021-12-20 19:38:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cb6c55a639
					 | 
					
						
						
							
							Added user login
						
						
						
						
						
						
					 | 
					
						2021-12-20 19:26:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						60be6933be
					 | 
					
						
						
							
							Added back, today and next button
						
						
						
						
						
						
					 | 
					
						2021-12-20 16:56:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						50896a26ca
					 | 
					
						
						
							
							Merge branch '0510-Validierung' into merge
						
						
						
						
						
						
					 | 
					
						2021-12-20 12:58:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d081a88dcd
					 | 
					
						
						
							
							Added input validation for creating events
						
						
						
						
						
						
					 | 
					
						2021-12-20 12:57:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3f7fa449d5
					 | 
					
						
						
							
							First unstyled draft login ui
						
						
						
						
						
						
					 | 
					
						2021-12-20 11:56:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						da24f73f46
					 | 
					
						
						
							
							Added files and launching login.css ui
						
						
						
						
						
						
					 | 
					
						2021-12-13 12:58:38 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0296333733
					 | 
					
						
						
							
							fixed time format
						
						
						
						
						
						
					 | 
					
						2021-11-29 16:01:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5a3c3845ed
					 | 
					
						
						
							
							renamed projekt folder and package file
						
						
						
						
						
						
					 | 
					
						2021-11-29 15:44:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |