| 
							
							
								 Marie Birner | e4376c29b4 | Merge commit 'db3cf59d21a14ed87b6226484a1d7adb19322f64' # Conflicts:
#	templates/includes/forms/log.html.tera
#	templates/kiosk.html.tera | 2023-07-30 15:10:48 +02:00 |  | 
			
				
					| 
							
							
								 Marie Birner | 4d80421b9b | [WIP] styling kiosk page | 2023-07-30 15:10:09 +02:00 |  | 
			
				
					|  | db3cf59d21 | format tera files | 2023-07-30 14:33:50 +02:00 |  | 
			
				
					| 
							
							
								 Marie Birner | 2ff7e24cbd | [WIP] styling kiosk page | 2023-07-30 14:31:15 +02:00 |  | 
			
				
					|  | bf2135b1b3 | fix typo | 2023-07-30 14:16:58 +02:00 |  | 
			
				
					|  | 2e80f7bc38 | add logbook history | 2023-07-30 14:13:49 +02:00 |  | 
			
				
					|  | c414164b82 | push | 2023-07-30 14:00:15 +02:00 |  | 
			
				
					|  | 039df224a6 | first draft layout logbook | 2023-07-30 13:42:33 +02:00 |  | 
			
				
					|  | 861df59ebc | set some fields to required | 2023-07-28 10:25:57 +02:00 |  | 
			
				
					|  | 7093e29c9b | fix | 2023-07-27 14:44:47 +02:00 |  | 
			
				
					|  | 38300d826a | add kiosk mode | 2023-07-27 14:38:46 +02:00 |  | 
			
				
					|  | b3349c87ff | don't show cox twice | 2023-07-27 13:15:40 +02:00 |  | 
			
				
					|  | d5c16ad7a0 | allow non-cox to (only) use 1x | 2023-07-27 13:07:00 +02:00 |  | 
			
				
					|  | fad7d747d7 | fixes | 2023-07-27 12:31:53 +02:00 |  | 
			
				
					|  | c37d9fa393 | beautify frontend code | 2023-07-27 12:24:38 +02:00 |  | 
			
				
					|  | d2b162b397 | push | 2023-07-27 11:53:28 +02:00 |  | 
			
				
					|  | a633239c84 | push | 2023-07-27 11:50:52 +02:00 |  | 
			
				
					|  | 6f8e977ecc | push | 2023-07-27 11:47:34 +02:00 |  | 
			
				
					|  | 2707a8b17f | push | 2023-07-27 11:45:57 +02:00 |  | 
			
				
					|  | 553bbf24cd | push | 2023-07-27 11:43:10 +02:00 |  | 
			
				
					|  | 79679414d3 | mobile fix | 2023-07-27 11:35:20 +02:00 |  | 
			
				
					|  | 70930321ee | fun with js :-) | 2023-07-27 11:25:11 +02:00 |  | 
			
				
					|  | 00aaa2dd86 | remove debug | 2023-07-26 13:11:17 +02:00 |  | 
			
				
					|  | 48eb1b7dc2 | clean ui for logbook | 2023-07-26 12:56:19 +02:00 |  | 
			
				
					|  | 082fac9789 | add stats | 2023-07-24 20:56:46 +02:00 |  | 
			
				
					|  | 61961b24e2 | use autofocus | 2023-07-23 18:16:26 +02:00 |  | 
			
				
					|  | 9fa70b1411 | add functionality to finish logbook trips | 2023-07-23 16:49:14 +02:00 |  | 
			
				
					|  | 1d4c5f356d | add first draft of logbook | 2023-07-23 12:17:57 +02:00 |  | 
			
				
					|  | 524d1acee2 | add full CRUD for boats | 2023-07-22 15:34:42 +02:00 |  | 
			
				
					|  | c0bb6d51de | create create/delete/view function for boats | 2023-07-22 13:57:17 +02:00 |  | 
			
				
					|  | 49f254a9d5 | fix ci | 2023-06-28 14:32:35 +02:00 |  | 
			
				
					|  | a17726e714 | lower bound = 0 for unused seats | 2023-06-28 14:15:03 +02:00 |  | 
			
				
					|  | 70e3d7524d | update deps; switch to hü :-) | 2023-05-30 09:04:13 +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 |  | 
			
				
					| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 Marie Birner | 1f29779ede | [TASK] layout trip_types and add onclick join msg javascript | 2023-05-03 16:14:18 +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 |  | 
			
				
					| 
							
							
								 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 | 9384c78f42 | change header message box sidebar | 2023-04-28 19:33:56 +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 |  | 
			
				
					|  | 55ca9a5c15 | add optional min=0 field; add time for starting time | 2023-04-18 21:41:16 +02:00 |  | 
			
				
					| 
							
							
								 Marie Birner | 41ee9f05d6 | [TASK] change card layout | 2023-04-08 07:29:39 +02:00 |  | 
			
				
					| 
							
							
								 Marie Birner | e8799e5766 | [TASK] style edit form trip | 2023-04-07 21:30:55 +02:00 |  | 
			
				
					| 
							
							
								 Marie Birner | 69c7eebd54 | [WIP] filter btn cox list view | 2023-04-07 12:37:33 +02:00 |  |