| 
						
					 | 
					
						
						
							
						
						b7aaea5fe8
					 | 
					
						
						
							
							allow trip_type specification for creating a trip
						
						
						
						
						
						
					 | 
					
						2023-05-05 09:28:29 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f9f9f49197
					 | 
					
						
						
							
							fix typo
						
						
						
						
						
						
					 | 
					
						2023-05-04 10:25:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9b4433ab09
					 | 
					
						
						
							
							fix typos
						
						
						
						
						
						
					 | 
					
						2023-05-03 23:17:05 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8effe700d0
					 | 
					
						
						
							
							Merge branch 'faq' into 'main'
						
						
						
						
						
						
						
						Faq
See merge request PhilippHofer/rot!9 
						
						
					 | 
					
						2023-05-03 20:59:24 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						69ea13a365
					 | 
					
						
						
							
							show different faq depending on user type
						
						
						
						
						
						
					 | 
					
						2023-05-03 22:50:05 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marie Birner
							
						 
					 | 
					
						
						
							
						
						8d951b9a1b
					 | 
					
						
						
							
							[TASK] add macro for faq
						
						
						
						
						
						
					 | 
					
						2023-05-03 22:41:37 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9f7fa6b8c4
					 | 
					
						
						
							
							add edit option of planned_events
						
						
						
						
						
						
					 | 
					
						2023-05-03 22:40:22 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marie Birner
							
						 
					 | 
					
						
						
							
						
						db5f151b96
					 | 
					
						
						
							
							[TASK] add faqs for cox
						
						
						
						
						
						
					 | 
					
						2023-05-03 17:11:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						787b28cc23
					 | 
					
						
						
							
							allow trip_type edit of trip
						
						
						
						
						
						
					 | 
					
						2023-05-03 16:51:37 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c9932b550b
					 | 
					
						
						
							
							add faq route
						
						
						
						
						
						
					 | 
					
						2023-05-03 16:31:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marie Birner
							
						 
					 | 
					
						
						
							
						
						1f29779ede
					 | 
					
						
						
							
							[TASK] layout trip_types and add onclick join msg javascript
						
						
						
						
						
						
					 | 
					
						2023-05-03 16:14:18 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marie Birner
							
						 
					 | 
					
						
						
							
						
						15644e8a0b
					 | 
					
						
						
							
							Merge commit 'e5088bddb0ab694abac5f6d2ab2d76a5042e52bb' into feature/frontend-triptype
						
						
						
						
						
						
						
						# Conflicts:
#	templates/index.html.tera 
						
						
					 | 
					
						2023-05-03 15:26:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bb4dba7bc9
					 | 
					
						
						
							
							only allow guests to register for specific events; don't even show them the other trips
						
						
						
						
						
						
					 | 
					
						2023-04-29 18:57:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Philipp
							
						 
					 | 
					
						
						
							
						
						a2a124d8c0
					 | 
					
						
						
							
							if clause forms add trip and add event
						
						
						
						
						
						
					 | 
					
						2023-04-28 22:12:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5421a3658d
					 | 
					
						
						
							
							Merge branch 'feature/cancelation' into 'main'
						
						
						
						
						
						
						
						Feature/cancelation
See merge request PhilippHofer/rot!6 
						
						
					 | 
					
						2023-04-28 19:50:48 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2730687d97
					 | 
					
						
						
							
							Merge branch 'feature/input-labels' into 'main'
						
						
						
						
						
						
						
						show input labels in default case
See merge request PhilippHofer/rot!8 
						
						
					 | 
					
						2023-04-28 19:47:00 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						29234e08af
					 | 
					
						
						
							
							Update index.html.tera
						
						
						
						
						
						
					 | 
					
						2023-04-28 19:42:12 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Philipp
							
						 
					 | 
					
						
						
							
						
						cb4d53c7f7
					 | 
					
						
						
							
							style delete button in admin view
						
						
						
						
						
						
					 | 
					
						2023-04-28 21:22:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0861d8b8d6
					 | 
					
						
						
							
							first draft of using trip types
						
						
						
						
						
						
					 | 
					
						2023-04-28 21:21:21 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Philipp
							
						 
					 | 
					
						
						
							
						
						e51bd5882f
					 | 
					
						
						
							
							show input labels in default case
						
						
						
						
						
						
					 | 
					
						2023-04-28 21:06:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Philipp
							
						 
					 | 
					
						
						
							
						
						d6b0ce1603
					 | 
					
						
						
							
							show cancelation in sidebar
						
						
						
						
						
						
					 | 
					
						2023-04-28 20:46:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Philipp
							
						 
					 | 
					
						
						
							
						
						cecf15320d
					 | 
					
						
						
							
							show status of trip by adding icon and text
						
						
						
						
						
						
					 | 
					
						2023-04-28 20:22:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Philipp
							
						 
					 | 
					
						
						
							
						
						cdebcefae8
					 | 
					
						
						
							
							show alert messages in admin view
						
						
						
						
						
						
					 | 
					
						2023-04-28 19:47:33 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Philipp
							
						 
					 | 
					
						
						
							
						
						9baae98ecb
					 | 
					
						
						
							
							show alert messages in admin view
						
						
						
						
						
						
					 | 
					
						2023-04-28 19:44:32 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ce8ea22190
					 | 
					
						
						
							
							Merge branch 'delete-user' into 'main'
						
						
						
						
						
						
						
						allow 'deletion' of user
See merge request PhilippHofer/rot!2 
						
						
					 | 
					
						2023-04-28 17:39:09 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Philipp
							
						 
					 | 
					
						
						
							
						
						071f88c9a7
					 | 
					
						
						
							
							change header message box sidebar
						
						
						
						
						
						
					 | 
					
						2023-04-28 19:35:21 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Philipp
							
						 
					 | 
					
						
						
							
						
						9384c78f42
					 | 
					
						
						
							
							change header message box sidebar
						
						
						
						
						
						
					 | 
					
						2023-04-28 19:33:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						055c330a3e
					 | 
					
						
						
							
							allow 'deletion' of user
						
						
						
						
						
						
					 | 
					
						2023-04-28 19:29:20 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Philipp
							
						 
					 | 
					
						
						
							
						
						1e29fab4d1
					 | 
					
						
						
							
							fix divider visual bug between events and trips
						
						
						
						
						
						
					 | 
					
						2023-04-28 19:27:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Philipp
							
						 
					 | 
					
						
						
							
						
						62617b4b42
					 | 
					
						
						
							
							show if_guest next to name change color
						
						
						
						
						
						
					 | 
					
						2023-04-28 19:16:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Philipp
							
						 
					 | 
					
						
						
							
						
						ed684a0ff5
					 | 
					
						
						
							
							show if_guest next to name
						
						
						
						
						
						
					 | 
					
						2023-04-28 19:04:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Philipp
							
						 
					 | 
					
						
						
							
						
						a8dbf6b025
					 | 
					
						
						
							
							add missing sidebar
						
						
						
						
						
						
					 | 
					
						2023-04-28 18:55:51 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Philipp
							
						 
					 | 
					
						
						
							
						
						7950b23c49
					 | 
					
						
						
							
							TASK improve structure index file
						
						
						
						
						
						
					 | 
					
						2023-04-28 18:35:42 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d535d241e4
					 | 
					
						
						
							
							more clear about how many rowers should be added
						
						
						
						
						
						
					 | 
					
						2023-04-21 21:12:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						55ca9a5c15
					 | 
					
						
						
							
							add optional min=0 field; add time for starting time
						
						
						
						
						
						
					 | 
					
						2023-04-18 21:41:16 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b50d546a5c
					 | 
					
						
						
							
							show how many people can join trip, even if no one is registered yet
						
						
						
						
						
						
					 | 
					
						2023-04-18 11:09:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						57750620b0
					 | 
					
						
						
							
							add  example of time format
						
						
						
						
						
						
					 | 
					
						2023-04-18 11:06:29 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						30c7637693
					 | 
					
						
						
							
							make 'Steuern' gray if already enough cox enrolled
						
						
						
						
						
						
					 | 
					
						2023-04-17 19:37:21 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ac534cf690
					 | 
					
						
						
							
							make 'Steuern' gray if already enough cox enrolled
						
						
						
						
						
						
					 | 
					
						2023-04-17 19:34:22 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d9bb190301
					 | 
					
						
						
							
							be more precise with cox_needed
						
						
						
						
						
						
					 | 
					
						2023-04-17 19:21:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marie Birner
							
						 
					 | 
					
						
						
							
						
						1e9f3a74fb
					 | 
					
						
						
							
							[BUGFIX] favicon & title tag head
						
						
						
						
						
						
					 | 
					
						2023-04-13 21:27:05 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marie Birner
							
						 
					 | 
					
						
						
							
						
						5a40f8ebd6
					 | 
					
						
						
							
							[BUGFIX] layout shift after filterung
						
						
						
						
						
						
					 | 
					
						2023-04-10 23:10:24 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marie Birner
							
						 
					 | 
					
						
						
							
						
						25a27b492c
					 | 
					
						
						
							
							[WIP] filter btns session storage
						
						
						
						
						
						
					 | 
					
						2023-04-10 22:42:00 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marie Birner
							
						 
					 | 
					
						
						
							
						
						504192e5f2
					 | 
					
						
						
							
							[TASK] improve functionality cox_needed filter
						
						
						
						
						
						
					 | 
					
						2023-04-10 15:00:25 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marie Birner
							
						 
					 | 
					
						
						
							
						
						2112d2bdae
					 | 
					
						
						
							
							[BUGFIX] refactor buttons
						
						
						
						
						
						
					 | 
					
						2023-04-09 19:03:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marie Birner
							
						 
					 | 
					
						
						
							
						
						e7a4b2e8b9
					 | 
					
						
						
							
							[TASK] refactor sidebar close btn
						
						
						
						
						
						
					 | 
					
						2023-04-08 09:24:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marie Birner
							
						 
					 | 
					
						
						
							
						
						d8049dd1e6
					 | 
					
						
						
							
							[TASK] refactor sidebar
						
						
						
						
						
						
					 | 
					
						2023-04-08 09:17:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marie Birner
							
						 
					 | 
					
						
						
							
						
						f1c812b436
					 | 
					
						
						
							
							[TASK] refactor sidebar
						
						
						
						
						
						
					 | 
					
						2023-04-08 09:14:48 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marie Birner
							
						 
					 | 
					
						
						
							
						
						276e2fae88
					 | 
					
						
						
							
							[BUGIFX] edit trip styling
						
						
						
						
						
						
					 | 
					
						2023-04-08 07:44:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marie Birner
							
						 
					 | 
					
						
						
							
						
						8f5c0f1b05
					 | 
					
						
						
							
							[BUGFIX] rounded is_cox add trip
						
						
						
						
						
						
					 | 
					
						2023-04-08 07:33:32 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |