2399 Commits

Author SHA1 Message Date
7c48ecdfd9 Merge branch 'staging' into fix-staging-seeds 2024-10-11 12:40:49 +02:00
6fdeee0e71 merged to master :-) 2024-10-11 12:39:01 +02:00
bdde326f03 user-role-cluster ()
Reviewed-on: 
2024-10-11 11:20:58 +02:00
10d220773b fix ci 2024-10-11 11:09:23 +02:00
aae206d8d9 remove unnecessary comment 2024-10-11 10:36:03 +02:00
0057a58eff add new db plot 2024-10-11 10:35:08 +02:00
ca51ba420c update docs to account for new db 2024-10-11 10:34:27 +02:00
24a874f888 be more thorough in tests 2024-10-11 10:30:40 +02:00
9bacbb9395 fix backend tests 2024-10-11 10:29:13 +02:00
9881627186 make it work with changed db model, but no select yet 2024-10-11 10:18:53 +02:00
91bf71cf00 start working on frontend 2024-10-11 09:58:53 +02:00
f8f18def90 create cluster in userrole 2024-10-11 09:29:26 +02:00
0cc72f17a1 Merge pull request 'docs' () from docs into main
Reviewed-on: 
2024-10-08 10:10:43 +02:00
aca4fc82e4 Merge pull request 'docs' () from docs into staging
Reviewed-on: 
2024-10-08 10:10:38 +02:00
318fe13666 proper headers 2024-10-08 10:09:12 +02:00
c2f7583b38 fix indentation 2024-10-08 10:08:06 +02:00
96fd9c8ed6 fix line breaks 2024-10-08 10:07:34 +02:00
dd487853bc add docs 2024-10-08 10:06:29 +02:00
48a817e9ca add doc subfolder 2024-10-08 09:36:32 +02:00
17d97a5e25 Merge pull request 'pull' () from ui-improvements into main
Reviewed-on: 
2024-09-24 20:13:41 +02:00
10b55387a4 Merge pull request 'update docker image' () from update-docker into main
Reviewed-on: 
2024-09-24 20:13:12 +02:00
44ccbea376 Merge pull request 'update docker image' () from update-docker into staging
Reviewed-on: 
2024-09-24 20:13:02 +02:00
b792088593 Merge pull request 'ui-improvements' () from ui-improvements into staging
Reviewed-on: 
2024-09-24 20:12:23 +02:00
461819923d Merge branch 'staging' into ui-improvements 2024-09-24 20:11:56 +02:00
b6efe5170b lint code 2024-09-24 20:10:59 +02:00
Marie Birner
4581ec4abc [TASK] style schnupperer even more 2024-09-24 20:09:53 +02:00
ca8cd4612d add additional role 2024-09-24 20:01:14 +02:00
c99686f72f update docker image 2024-09-24 19:45:30 +02:00
Marie Birner
2cdfacab53 [BUGFIX] dark mode bg issue 2024-09-24 19:44:33 +02:00
6d3c8bffa3 Merge pull request 'ui-improvements' () from ui-improvements into main
Reviewed-on: 
2024-09-24 19:43:46 +02:00
cecd5e8106 Merge pull request 'ui-improvements' () from ui-improvements into staging
Reviewed-on: 
2024-09-19 11:49:43 +02:00
615898ead4 Merge branch 'staging' into ui-improvements 2024-09-19 11:29:11 +02:00
Marie Birner
2663772651 [TASK] style fees page 2024-09-18 09:58:19 +02:00
Marie Birner
b7e3c882d8 [TASK] change schnupper ui and hopefully improve it 2024-09-17 13:06:39 +02:00
56f5b6e8db Merge pull request 'inform board if more trips than allowed' () from mail-end-scheckbuch into main
Reviewed-on: 
2024-09-12 08:36:20 +02:00
102cc90a23 Merge pull request 'inform board if more trips than allowed' () from mail-end-scheckbuch into staging
Reviewed-on: 
2024-09-12 08:36:09 +02:00
b429998775 inform board if more trips than allowed 2024-09-12 08:35:10 +02:00
5727c0c9ce Merge pull request 'send scheckbuch people mail after using all trips' () from mail-end-scheckbuch into main
Reviewed-on: 
2024-09-11 23:53:08 +02:00
ece64868fe Merge pull request 'mail-end-scheckbuch' () from mail-end-scheckbuch into staging
Reviewed-on: 
2024-09-11 23:52:58 +02:00
1225aeac94 send scheckbuch people mail after using all trips 2024-09-11 23:52:16 +02:00
8408148ead Merge pull request 'show type of boat' () from art into main
Reviewed-on: 
2024-09-11 19:10:46 +02:00
d0d7da7996 Merge pull request 'art' () from art into staging
Reviewed-on: 
2024-09-11 19:10:40 +02:00
14bfb695d9 show type of boat 2024-09-11 19:10:02 +02:00
1da9412904 Merge pull request '[BUGFIX] mobile version calendar integration start page' () from fix-calender into main
Reviewed-on: 
2024-09-11 11:43:33 +02:00
abe256af5d Merge pull request 'fix-calender' () from fix-calender into staging
Reviewed-on: 
2024-09-11 11:43:18 +02:00
8666b014f2 also show own trips 2024-09-11 11:42:59 +02:00
Marie Birner
af8637d2b7 [BUGFIX] mobile version calendar integration start page 2024-09-11 11:21:14 +02:00
c7d3435f4d Merge pull request 'cal' () from cal into main
Reviewed-on: 
2024-09-11 00:11:16 +02:00
3e14b61ce5 Merge pull request 'cal' () from cal into staging
Reviewed-on: 
2024-09-10 23:47:32 +02:00
14d546bdc3 finalize todo 2024-09-10 23:46:59 +02:00