| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ea6420e234
					 | 
					
						
						
							
							Added Auth-Header
						
						
						
						
						
						
					 | 
					
						2022-01-11 17:12:37 +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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						125ee67ccd
					 | 
					
						
						
							
							renamed projekt folder and package file
						
						
						
						
						
						
					 | 
					
						2021-11-29 15:43:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fab28a0e16
					 | 
					
						
						
							
							removed test files
						
						
						
						
						
						
					 | 
					
						2021-11-29 15:20:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1a8bbbfce7
					 | 
					
						
						
							
							Added delete event functionality
						
						
						
						
						
						
					 | 
					
						2021-11-28 18:22:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e8c7fb8a08
					 | 
					
						
						
							
							Send a POST request to create an event in DB
						
						
						
						
						
						
					 | 
					
						2021-11-28 17:29:34 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0043e7f1bd
					 | 
					
						
						
							
							Added Post request;
						
						
						
						
						
						
						
						Get events from DB;
Insert events into ui; 
						
						
					 | 
					
						2021-11-28 15:12:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6d9e7c5929
					 | 
					
						
						
							
							Created controller for CreateEventView
						
						
						
						
						
						
					 | 
					
						2021-11-28 08:13:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ccaf6dbe62
					 | 
					
						
						
							
							Fixed JavaFX version waring again ;D
						
						
						
						
						
						
					 | 
					
						2021-11-27 22:40:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5a4a1e70e8
					 | 
					
						
						
							
							merged 0300 and 0120
						
						
						
						
						
						
					 | 
					
						2021-11-26 13:30:51 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dc1b1643d8
					 | 
					
						
						
							
							Merge branch '0300-Kalender' into merge
						
						
						
						
						
						
						
						# Conflicts:
#	hellofx/app/build/resources/main/client/style.css
#	hellofx/app/src/main/resources/client/style.css 
						
						
					 | 
					
						2021-11-26 13:25:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6a40ebfcfc
					 | 
					
						
						
							
							improved the main view and the main-view.css
						
						
						
						
						
						
					 | 
					
						2021-11-26 13:01:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e3beeda254
					 | 
					
						
						
							
							improved ui
						
						
						
						
						
						
					 | 
					
						2021-11-26 08:02:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6fe7cb06c1
					 | 
					
						
						
							
							added abort button
						
						
						
						
						
						
					 | 
					
						2021-11-25 21:12:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2785c04d78
					 | 
					
						
						
							
							filled scene 'create-event' with live
						
						
						
						
						
						
					 | 
					
						2021-11-25 15:04:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						842a83af3b
					 | 
					
						
						
							
							changed the main view and the style.css
						
						
						
						
						
						
					 | 
					
						2021-11-25 14:47:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1900f83b45
					 | 
					
						
						
							
							created new window
						
						
						
						
						
						
					 | 
					
						2021-11-25 11:34:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						18d5b528af
					 | 
					
						
						
							
							added class vbox-main and main- pannel in the css
						
						
						
						
						
						
					 | 
					
						2021-11-22 13:37:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						af3ffe807c
					 | 
					
						
						
							
							removed buildfile
						
						
						
						
						
						
					 | 
					
						2021-11-17 21:32:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7b12642a66
					 | 
					
						
						
							
							Updated .gitignore
						
						
						
						
						
						
						
						ignore all ".gradle" and "build" folder 
						
						
					 | 
					
						2021-11-17 21:27:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						95de4b5985
					 | 
					
						
						
							
							Fixed JavaFX version waring
						
						
						
						
						
						
					 | 
					
						2021-11-15 19:04:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6971a42b39
					 | 
					
						
						
							
							changed layout
						
						
						
						
						
						
					 | 
					
						2021-11-15 15:36:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						23be5a1b91
					 | 
					
						
						
							
							Merge branch '0100-Termine_anzeigen' into 0300-Kalender
						
						
						
						
						
						
					 | 
					
						2021-11-15 13:25:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2944c44d1d
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/0100-Termine_anzeigen' into 0100-Termine_anzeigen
						
						
						
						
						
						
						
						# Conflicts:
#	hellofx/app/build/resources/main/client/main-view.fxml 
						
						
					 | 
					
						2021-11-15 13:22:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e51ef5c49d
					 | 
					
						
						
							
							added css
						
						
						
						
						
						
					 | 
					
						2021-11-15 13:21:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bab5ef0a93
					 | 
					
						
						
							
							added css
						
						
						
						
						
						
					 | 
					
						2021-11-15 13:17:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8f3042c5f9
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/0300-Kalender' into 0300-Kalender
						
						
						
						
						
						
					 | 
					
						2021-11-15 13:11:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |