| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |