| 
						
					 | 
					
						
						
							
						
						16ca1a3482
					 | 
					
						
						
							
							don't be too funny
						
						
						
						
						
						
					 | 
					
						2023-09-05 15:46:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marie Birner
							
						 
					 | 
					
						
						
							
						
						36d86b079b
					 | 
					
						
						
							
							[TASK] replace Freitag with Markttag for phipsi
						
						
						
						
						
						
					 | 
					
						2023-09-05 15:46:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4ef88ba6c5
					 | 
					
						
						
							
							don't be too funny
						
						
						
						
						
						
					 | 
					
						2023-09-05 15:44:50 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marie Birner
							
						 
					 | 
					
						
						
							
						
						c06173d04b
					 | 
					
						
						
							
							[TASK] replace Freitag with Markttag for phipsi
						
						
						
						
						
						
					 | 
					
						2023-09-05 15:44:50 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e6daa99974
					 | 
					
						
						
							
							fix order ci
						
						
						
						
						
						
					 | 
					
						2023-09-05 13:54:03 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						22fbc715ec
					 | 
					
						
						
							
							Merge branch 'funny-replace' of gitlab.com:PhilippHofer/rot into funny-replace
						
						
						
						
						
						
					 | 
					
						2023-09-05 13:44:37 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ac728dc203
					 | 
					
						
						
							
							don't be too funny
						
						
						
						
						
						
					 | 
					
						2023-09-05 13:44:33 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marie Birner
							
						 
					 | 
					
						
						
							
						
						df26112820
					 | 
					
						
						
							
							[TASK] replace Freitag with Markttag for phipsi
						
						
						
						
						
						
					 | 
					
						2023-09-05 13:44:07 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						21eef385d8
					 | 
					
						
						
							
							Merge branch 'upgrade-deps' of gitlab.com:PhilippHofer/rot into upgrade-deps
						
						
						
						
						
						
					 | 
					
						2023-09-05 13:43:47 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6e68e71369
					 | 
					
						
						
							
							update deps
						
						
						
						
						
						
					 | 
					
						2023-09-05 13:43:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c23d22d027
					 | 
					
						
						
							
							install npm
						
						
						
						
						
						
					 | 
					
						2023-09-05 13:41:11 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						39a9347bab
					 | 
					
						
						
							
							use new nodejs
						
						
						
						
						
						
					 | 
					
						2023-09-05 13:38:53 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6bdb2610bd
					 | 
					
						
						
							
							update deps
						
						
						
						
						
						
					 | 
					
						2023-09-05 13:28:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						71ec5ce01a
					 | 
					
						
						
							
							Merge branch 'staging' into 'main'
						
						
						
						
						
						
						
						Staging
See merge request PhilippHofer/rot!30 
						
						
					 | 
					
						2023-09-05 11:27:30 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						689ff36534
					 | 
					
						
						
							
							don't be too funny
						
						
						
						
						
						
					 | 
					
						2023-09-05 13:21:18 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c5f3c8d1f3
					 | 
					
						
						
							
							push
						
						
						
						
						
						
					 | 
					
						2023-09-05 13:20:42 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marie Birner
							
						 
					 | 
					
						
						
							
						
						d07581aa3d
					 | 
					
						
						
							
							[TASK] replace Freitag with Markttag for phipsi
						
						
						
						
						
						
					 | 
					
						2023-09-05 13:19:44 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						31435e9c3b
					 | 
					
						
						
							
							rename labels
						
						
						
						
						
						
					 | 
					
						2023-08-09 23:39:11 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						662f952807
					 | 
					
						
						
							
							Merge branch 'allow_to_add_real_guests' into 'staging'
						
						
						
						
						
						
						
						Allow to add real guests
See merge request PhilippHofer/rot!28 
						
						
					 | 
					
						2023-08-09 20:30:37 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						590b41aa33
					 | 
					
						
						
							
							Allow to add real guests
						
						
						
						
						
						
					 | 
					
						2023-08-09 20:30:37 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						723ada09b0
					 | 
					
						
						
							
							update deps
						
						
						
						
						
						
					 | 
					
						2023-08-09 13:43:51 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4acefb3749
					 | 
					
						
						
							
							fix typo
						
						
						
						
						
						
					 | 
					
						2023-08-09 12:43:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5deece48ea
					 | 
					
						
						
							
							Merge branch 'staging' into 'main'
						
						
						
						
						
						
						
						Staging
See merge request PhilippHofer/rot!27 
						
						
					 | 
					
						2023-08-09 10:15:38 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0afd523e05
					 | 
					
						
						
							
							update faq
						
						
						
						
						
						
					 | 
					
						2023-08-09 12:01:49 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bd4ee5954c
					 | 
					
						
						
							
							implement is_locked for trip_details
						
						
						
						
						
						
					 | 
					
						2023-08-09 11:54:18 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						21c5609b31
					 | 
					
						
						
							
							set test logbook data
						
						
						
						
						
						
					 | 
					
						2023-08-05 16:58:20 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f0c6bdac14
					 | 
					
						
						
							
							fix ci; clean code
						
						
						
						
						
						
					 | 
					
						2023-08-05 16:29:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						94a9d285be
					 | 
					
						
						
							
							clean db
						
						
						
						
						
						
					 | 
					
						2023-08-05 16:27:51 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						64aefde8bc
					 | 
					
						
						
							
							fix stat query
						
						
						
						
						
						
					 | 
					
						2023-08-05 15:58:17 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7309b1f2b2
					 | 
					
						
						
							
							update unit tests; add location name in kiosk settting to cookie (to avoid specific redirects)
						
						
						
						
						
						
					 | 
					
						2023-08-05 13:21:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e459a4e2d9
					 | 
					
						
						
							
							store loation in kiosk cookie, to avoid having to handle each location separately
						
						
						
						
						
						
					 | 
					
						2023-08-05 13:09:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						351ba1ba4e
					 | 
					
						
						
							
							fix tests, default redirect to linz kiosk
						
						
						
						
						
						
					 | 
					
						2023-08-05 13:01:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						23844243b8
					 | 
					
						
						
							
							Merge branch 'staging' of gitlab.com:PhilippHofer/rot into staging
						
						
						
						
						
						
					 | 
					
						2023-08-05 12:59:23 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8a40dfe017
					 | 
					
						
						
							
							allow filter for kiosk, to only show boats at specific location
						
						
						
						
						
						
					 | 
					
						2023-08-05 12:59:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d556e67cee
					 | 
					
						
						
							
							Merge branch 'staging' into 'main'
						
						
						
						
						
						
						
						create tests for model/logbook
See merge request PhilippHofer/rot!26 
						
						
					 | 
					
						2023-08-05 10:51:56 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2192bb73ed
					 | 
					
						
						
							
							Merge branch 'fix-order-trips' into 'staging'
						
						
						
						
						
						
						
						fix order of displayed trips + events
See merge request PhilippHofer/rot!23 
						
						
					 | 
					
						2023-08-05 10:38:58 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6809a85749
					 | 
					
						
						
							
							add option to lock boat on damage
						
						
						
						
						
						
					 | 
					
						2023-08-05 12:05:54 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f3c18c6949
					 | 
					
						
						
							
							update mail address
						
						
						
						
						
						
					 | 
					
						2023-08-02 18:36:38 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8eb8597293
					 | 
					
						
						
							
							allow optional different table in staging
						
						
						
						
						
						
					 | 
					
						2023-08-02 15:02:03 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ff31ad83fe
					 | 
					
						
						
							
							add boatdamages functionality
						
						
						
						
						
						
					 | 
					
						2023-08-02 14:29:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f7e623b8c3
					 | 
					
						
						
							
							strip binary
						
						
						
						
						
						
					 | 
					
						2023-08-01 14:53:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f2baca668c
					 | 
					
						
						
							
							add tests for tera/admin/planned_event
						
						
						
						
						
						
						
						Closes #19 
						
						
					 | 
					
						2023-07-31 21:33:49 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						da6a16cd66
					 | 
					
						
						
							
							add tests for tera/admin/planned_event
						
						
						
						
						
						
						
						Closes #20 
						
						
					 | 
					
						2023-07-31 21:29:03 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8fa8e17c5a
					 | 
					
						
						
							
							add tests for tera/admin/planned_event
						
						
						
						
						
						
						
						Closes #24 
						
						
					 | 
					
						2023-07-31 21:15:28 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						96af3c3b17
					 | 
					
						
						
							
							create tests for /public
						
						
						
						
						
						
						
						Closes #25 
						
						
					 | 
					
						2023-07-31 21:07:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						91ffcbb720
					 | 
					
						
						
							
							Merge branch 'fix-order-trips' of gitlab.com:PhilippHofer/rot into fix-order-trips
						
						
						
						
						
						
					 | 
					
						2023-07-31 20:12:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5b8dfb8284
					 | 
					
						
						
							
							fix order of displayed trips + events
						
						
						
						
						
						
					 | 
					
						2023-07-31 20:12:50 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3730940aed
					 | 
					
						
						
							
							add tests for tera/log.rs
						
						
						
						
						
						
						
						Closes #34 
						
						
					 | 
					
						2023-07-31 20:09:03 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8b5be3fb41
					 | 
					
						
						
							
							add test for tera/admin/boat.rs
						
						
						
						
						
						
						
						Fixes #33 
						
						
					 | 
					
						2023-07-31 19:38:53 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						47b534f8c3
					 | 
					
						
						
							
							create tests for model/logbook
						
						
						
						
						
						
						
						Closes #31 
						
						
					 | 
					
						2023-07-31 19:10:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |