Commit Graph

2119 Commits

Author SHA1 Message Date
4f4c053d0e ergo-admin-edit 2023-11-07 21:27:40 +01:00
c0cefd82b6 slightly change labels 2023-11-07 20:53:45 +01:00
7c684a30f7 update deps; allow gallery image select 2023-11-07 20:49:22 +01:00
7bd07b911a use a slightly brighter black 2023-11-07 15:31:06 +01:00
Marie Birner
48f26a1379 Merge branch 'dark-mode' into staging 2023-11-04 20:53:29 +01:00
Marie Birner
8123299861 [BUGFIX] login screen dark mode 2023-11-04 20:51:03 +01:00
Marie Birner
e3ba0a033a Merge branch 'dark-mode' into staging 2023-11-04 20:17:49 +01:00
Marie Birner
895492946c [TASK] add color switch option btn 2023-11-04 20:16:20 +01:00
Marie Birner
b465923fa9 [TASK] support dark mode second draft 2023-11-04 19:45:57 +01:00
Marie Birner
97897437a9 [TASK] support dark mode second draft 2023-11-04 19:33:36 +01:00
Marie Birner
2fd053efed Merge commit 'bc9c5198d1a1df7526ee95de9411f8e7d0a60894' into dark-mode 2023-11-04 17:25:14 +01:00
Marie Birner
bc9c5198d1 Merge branch 'fix-rower-select-error' into 'main'
Fix rower select error

See merge request PhilippHofer/rot!81
2023-11-04 16:19:54 +00:00
020ecfb154 Merge branch 'fix-rower-select-error' into 'staging'
push

See merge request PhilippHofer/rot!80
2023-11-04 15:40:47 +00:00
0f8c7a365e push 2023-11-04 16:27:17 +01:00
9de2a615a6 Merge branch 'show-proper-amount-guests' into 'staging'
show proper amount of guests (changed bc cox is now included in rowers)

See merge request PhilippHofer/rot!78
2023-11-04 14:39:43 +00:00
c2034ed690 show proper amount of guests (changed bc cox is now included in rowers) 2023-11-04 15:07:16 +01:00
Marie Birner
5f494dc9e9 [TASK] support dark mode first draft 2023-11-04 00:19:46 +01:00
555882b4c7 Merge branch 'ergo-styling' into 'staging'
Ergo styling

See merge request PhilippHofer/rot!77
2023-11-03 13:48:16 +00:00
Marie Birner
c4e3c836e2 [TASK] guest user menu ergo 2023-11-03 14:35:15 +01:00
Marie Birner
150a86c2f1 Merge commit '95e1ea302884fa1214950b6c4005525f7469ac58' into ergo-styling 2023-11-03 14:31:14 +01:00
Marie Birner
8014dba27e [TASK] guest user menu ergo 2023-11-03 14:30:43 +01:00
95e1ea3028 allow guests to see + upload ergo entries; show ergo menu item for guests 2023-11-03 14:20:58 +01:00
5ac3ae348c Merge branch 'ergo-styling' into 'main'
[TASK] styling ergo challenge screen

See merge request PhilippHofer/rot!75
2023-11-03 11:21:00 +00:00
Marie Birner
a1d7bd8269 Merge branch 'ergo-styling' into 'staging'
Ergo styling

Closes #46

See merge request PhilippHofer/rot!74
2023-11-03 10:05:52 +00:00
Marie Birner
1522531baa [TASK] styling ergo challenge screen 2023-11-03 10:52:30 +01:00
Marie Birner
7bdaceaafe Merge branch 'auto-select-owner' into 'main'
auto select owner as rower of private boat, Fixes #46

See merge request PhilippHofer/rot!73
2023-11-03 07:11:15 +00:00
9331b2001d improve code with clippy 2023-11-02 22:19:13 +01:00
1b58641100 Merge branch 'auto-select-owner' into 'staging'
auto select owner as rower of private boat, Fixes #46

Closes #46

See merge request PhilippHofer/rot!72
2023-11-02 19:04:23 +00:00
f5ad37a0bb auto select owner as rower of private boat, Fixes #46 2023-11-02 19:50:19 +01:00
650e96cccd Merge branch 'staging' into 'main'
Staging

See merge request PhilippHofer/rot!71
2023-11-02 18:47:34 +00:00
d9322c9702 Merge branch 'staging' of gitlab.com:PhilippHofer/rot into staging 2023-11-02 19:32:24 +01:00
eb0f3ba9d8 clearer label 2023-11-02 19:32:16 +01:00
a9ded48feb Merge branch 'minor' into 'staging'
Minor

See merge request PhilippHofer/rot!69
2023-11-02 18:16:17 +00:00
0bbedfc9cc remove staging diff as it's deployed 2023-11-02 19:11:23 +01:00
77faf30475 push 2023-11-02 19:03:01 +01:00
71da6546b0 image required; cleaner log 2023-11-02 19:02:17 +01:00
a9ca715d6d push 2023-11-02 19:01:13 +01:00
27e40783e1 image required; cleaner log 2023-11-02 18:59:33 +01:00
c11b73b7e6 remove db migration as ergo changes are in prod. 2023-11-02 18:33:30 +01:00
cd611cf251 Merge branch 'ergo' into 'main'
Ergo stuff

See merge request PhilippHofer/rot!65
2023-11-02 17:26:45 +00:00
eddcdf292f Merge branch 'ergo' into 'staging'
Ergo

See merge request PhilippHofer/rot!68
2023-11-02 15:01:09 +00:00
039f9fbddf switch order 2023-11-02 16:00:41 +01:00
4afed60f29 Merge branch 'ergo' into 'staging'
better label

See merge request PhilippHofer/rot!67
2023-11-02 14:48:23 +00:00
2767e2fe25 better label 2023-11-02 15:34:21 +01:00
6c3fd89b00 Merge branch 'ergo' into 'staging'
migration + better ordering

See merge request PhilippHofer/rot!66
2023-11-02 14:17:51 +00:00
4726c25d20 migration + better ordering 2023-11-02 15:04:08 +01:00
d5c88ef956 Merge branch 'ergo' into 'staging'
fix limits

See merge request PhilippHofer/rot!64
2023-11-02 13:54:23 +00:00
8cb9bb36c7 fix limits 2023-11-02 14:40:26 +01:00
bf24c8aa9c Merge branch 'ergo' into 'staging'
Ergo

See merge request PhilippHofer/rot!63
2023-11-02 13:04:12 +00:00
50de29284f disable reload on ergo page; allow camera capture 2023-11-02 13:50:34 +01:00