2465 Commits

Author SHA1 Message Date
9c36da32bd Merge pull request 'demo' () from demo into staging
Reviewed-on: 
2024-11-30 22:33:12 +01:00
257cdcf823 add demo db for ruad.at 2024-11-30 22:32:15 +01:00
671a0fc89f Merge pull request 'Revert "adapt to new domain"' () from fix into main
Reviewed-on: 
2024-11-27 08:21:52 +01:00
77444d25ae Merge pull request 'fix' () from fix into staging
Reviewed-on: 
2024-11-27 08:21:48 +01:00
0ad62e2ece Revert "adapt to new domain"
This reverts commit c7b5b7e39d15bda54f53c5e217cb866018aeb257.
2024-11-27 08:20:54 +01:00
85c759d9b7 Merge pull request 'new-link' () from new-link into main
Reviewed-on: 
2024-11-27 08:20:27 +01:00
a683af00d0 Merge pull request 'new-link' () from new-link into staging
Reviewed-on: 
2024-11-27 08:14:00 +01:00
5a66211353 add new video link 2024-11-27 08:13:17 +01:00
a07ff1d993 Merge branch 'main' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt 2024-11-27 08:10:55 +01:00
b41457d30e Merge pull request 'nicer label' () from nicer-label into main
Reviewed-on: 
2024-11-25 21:02:13 +01:00
766886d857 Merge pull request 'nicer-label' () from nicer-label into staging
Reviewed-on: 
2024-11-25 21:01:38 +01:00
4408100e49 nicer label 2024-11-25 21:00:25 +01:00
32b8aa0145 Merge pull request 'allow non-cox to create ergo-trips' () from ergo-trips into main
Reviewed-on: 
2024-11-25 12:31:57 +01:00
38703321e8 Merge pull request 'ergo-trips' () from ergo-trips into staging
Reviewed-on: 
2024-11-25 12:31:50 +01:00
1f0b74554f allow non-cox to create ergo-trips 2024-11-25 12:12:36 +01:00
9d3b1d522b Merge pull request 'allow for smaller m' () from trim-ergo into main
Reviewed-on: 
2024-11-11 23:12:33 +01:00
ec1c717341 Merge pull request 'allow for smaller m' () from trim-ergo into staging
Reviewed-on: 
2024-11-11 23:12:23 +01:00
656c0b99ea allow for smaller m 2024-11-11 23:11:46 +01:00
85b39d472c Merge pull request 'allow m in dd' () from trim-ergo into main
Reviewed-on: 
2024-11-11 23:07:34 +01:00
22bb79bfbd Merge pull request 'allow m in dd' () from trim-ergo into staging
Reviewed-on: 
2024-11-11 23:07:28 +01:00
50f410d9fd allow m in dd 2024-11-11 23:06:53 +01:00
f574ae14db Merge pull request 'trim-ergo' () from trim-ergo into main
Reviewed-on: 
2024-11-11 23:00:13 +01:00
eba4b77983 Merge pull request 'trim-ergo' () from trim-ergo into staging
Reviewed-on: 
2024-11-11 23:00:08 +01:00
5c8966f34c always show full time 2024-11-11 22:57:46 +01:00
88c6469154 trim ergo entries 2024-11-11 22:45:32 +01:00
e33074f540 Merge pull request 'update data' () from formating-ergo into main
Reviewed-on: 
2024-11-11 18:03:49 +01:00
83d266b3e0 Merge pull request 'update data' () from formating-ergo into staging
Reviewed-on: 
2024-11-11 18:03:43 +01:00
768a96345e update data 2024-11-11 17:58:13 +01:00
c8cfcd619f Merge pull request 'fix tests' () from formating-ergo into main
Reviewed-on: 
2024-11-11 15:27:33 +01:00
980bcff1d9 Merge pull request 'fix tests' () from formating-ergo into staging
Reviewed-on: 
2024-11-11 15:27:15 +01:00
d7eaa14e55 fix tests 2024-11-11 15:26:33 +01:00
8e1b1c1aac Merge pull request 'formating-ergo' () from formating-ergo into main
Reviewed-on: 
2024-11-11 13:34:36 +01:00
c15ed6e9a9 Merge pull request 'formating-ergo' () from formating-ergo into staging
Reviewed-on: 
2024-11-11 13:34:31 +01:00
d5e6371b89 craete log if user creates a new event 2024-11-11 13:33:23 +01:00
eb49a829c6 formatting ergo 2024-11-11 10:27:50 +01:00
c7b5b7e39d adapt to new domain 2024-10-28 16:13:37 +01:00
d76ce744f1 Merge pull request '[TASK] add rudi win svg' () from rudi into main
Reviewed-on: 
2024-10-28 15:51:58 +01:00
61ec8bddb8 Merge pull request 'rudi' () from rudi into staging
Reviewed-on: 
2024-10-28 15:50:56 +01:00
Marie Birner
07e69d7833 [TASK] add rudi win svg 2024-10-28 09:22:24 +01:00
35866c216b Merge pull request 'fix initial selection' () from fix into main
Reviewed-on: 
2024-10-28 09:15:37 +01:00
c8b60fa518 Merge pull request 'fix' () from fix into staging
Reviewed-on: 
2024-10-28 09:15:14 +01:00
7e20120a02 fix initial selection 2024-10-28 09:14:19 +01:00
2c7b8d9393 Merge pull request 'use clusters in user roles' () from use-clusters into main
Reviewed-on: 
2024-10-28 08:20:37 +01:00
d2cebc7c67 Merge pull request 'use-clusters' () from use-clusters into staging
Reviewed-on: 
2024-10-28 08:20:04 +01:00
0c72dc9e4c use clusters in user roles 2024-10-28 08:19:32 +01:00
b4ec423b81 Merge pull request 'lint & allow to update 'handgesteuert' status of logbook' () from update-handgesteuert into main
Reviewed-on: 
2024-10-26 21:06:34 +02:00
13a372252d Merge pull request 'update-handgesteuert' () from update-handgesteuert into staging
Reviewed-on: 
2024-10-26 21:06:27 +02:00
fa364d0be9 lint & allow to update 'handgesteuert' status of logbook 2024-10-26 21:05:32 +02:00
d0b0888a9b Merge pull request 'inform people of participation; require updating personal data before joining' () from update-ergo into main
Reviewed-on: 
2024-10-25 21:00:49 +02:00
4b0460aeee Merge pull request 'update-ergo' () from update-ergo into staging
Reviewed-on: 
2024-10-25 20:59:53 +02:00