|
|
f1661f9eab
|
Merge branch 'new-rocket' into 'main'
New rocket
See merge request PhilippHofer/rot!87
|
2023-11-09 06:25:50 +00:00 |
|
|
|
8f45724848
|
Merge branch 'input-val' into 'main'
Input val
See merge request PhilippHofer/rot!89
|
2023-11-09 06:25:37 +00:00 |
|
|
|
63c7a27131
|
Merge branch 'ergo-admin-edit' into 'main'
Ergo admin edit
See merge request PhilippHofer/rot!84
|
2023-11-09 05:53:18 +00:00 |
|
|
|
1dd30f9c75
|
Merge branch 'brighter-black' into 'dark-mode'
use a slightly brighter black
See merge request PhilippHofer/rot!82
|
2023-11-09 05:52:36 +00:00 |
|
|
|
ae0a1121d4
|
Merge branch 'input-val' into 'staging'
simple (client only) val
See merge request PhilippHofer/rot!88
|
2023-11-08 17:16:02 +00:00 |
|
|
|
ae7391e239
|
Merge branch 'new-rocket' into 'staging'
update deps, switch to newest rocket version
See merge request PhilippHofer/rot!86
|
2023-11-08 17:03:25 +00:00 |
|
|
|
04958d80a4
|
Merge branch 'staging' into 'input-val'
# Conflicts:
# templates/ergo.html.tera
# templates/includes/macros.html.tera
|
2023-11-08 17:02:32 +00:00 |
|
|
|
e7a6d57bf0
|
simple (client only) val
|
2023-11-08 18:00:27 +01:00 |
|
|
|
144bcefcab
|
update deps, switch to newest rocket version
|
2023-11-08 17:39:39 +01:00 |
|
|
|
6db40f4d79
|
Merge branch 'ergo-admin-edit' into 'staging'
also allow dozen updates
See merge request PhilippHofer/rot!85
|
2023-11-07 21:15:04 +00:00 |
|
|
|
61cc470e0f
|
also allow dozen updates
|
2023-11-07 22:01:34 +01:00 |
|
|
|
3c20a3dc6a
|
Merge branch 'ergo-admin-edit' into 'staging'
ergo-admin-edit
See merge request PhilippHofer/rot!83
|
2023-11-07 20:41:17 +00:00 |
|
|
|
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 |
|
