| 
						
					 | 
					
						
						
							
						
						12fce27d04
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/merge' into merge
						
						
						
						
						
						
						
						# Conflicts:
#	client/data/src/main/java/res/Event.java 
						
						
					 | 
					
						2022-01-10 13:24:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d34d09aa2b
					 | 
					
						
						
							
							Changed REST-endpoints
						
						
						
						
						
						
					 | 
					
						2022-01-10 13:22:59 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						96e0853d20
					 | 
					
						
						
							
							Complete rewrite/restructure of the project
						
						
						
						
						
						
					 | 
					
						2021-11-14 23:00:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						22618081ee
					 | 
					
						
						
							
							First layout draft
						
						
						
						
						
						
					 | 
					
						2021-11-13 20:32:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						aae24ce058
					 | 
					
						
						
							
							Fixed gitignore
						
						
						
						
						
						
					 | 
					
						2021-11-13 20:31:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dcf8749a43
					 | 
					
						
						
							
							Created the initial JavaFX project
						
						
						
						
						
						
					 | 
					
						2021-11-13 20:11:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |