 philipp
|
87b5cff190
|
Merge branch 'new-people' into 'staging'
New people
See merge request PhilippHofer/rot!98
|
2023-11-09 21:29:59 +00:00 |
|
|
philipp
|
9b86d93979
|
try to get new people
|
2023-11-09 22:02:31 +01:00 |
|
|
philipp
|
9bfa89a841
|
Merge branch 'ergo-desc' into 'staging'
add notes about ergo challenge
See merge request PhilippHofer/rot!96
|
2023-11-09 21:02:28 +00:00 |
|
|
philipp
|
8926d82bd6
|
add notes about ergo challenge
|
2023-11-09 21:48:21 +01:00 |
|
|
philipp
|
dd436d3571
|
Merge branch 'bugfix-label' into 'main'
Bugfix Darkmode
See merge request PhilippHofer/rot!95
|
2023-11-09 20:37:33 +00:00 |
|
 Marie Birner
|
e8efe13ef5
|
Merge branch 'bugfix-label' into staging
|
2023-11-09 21:23:09 +01:00 |
|
|
Marie Birner
|
d7eb4faf03
|
[BUGFIX] filter issues
|
2023-11-09 21:22:55 +01:00 |
|
|
Marie Birner
|
d60cbc7b5a
|
Merge branch 'bugfix-label' into staging
|
2023-11-09 21:02:36 +01:00 |
|
|
Marie Birner
|
8c5fbfec63
|
[BUGFIX] filter issues
|
2023-11-09 21:02:21 +01:00 |
|
|
Marie Birner
|
7e02c840b4
|
Merge branch 'bugfix-label' into staging
|
2023-11-09 19:40:56 +01:00 |
|
|
Marie Birner
|
609483f1df
|
[BUGFIX] color text and btn dark-mode
|
2023-11-09 19:40:41 +01:00 |
|
|
Marie Birner
|
cdc42d7154
|
[BUGFIX] color text dark-mode
|
2023-11-09 19:39:23 +01:00 |
|
|
Marie Birner
|
88c99b0898
|
Merge branch 'bugfix-label' into staging
|
2023-11-09 19:38:09 +01:00 |
|
|
Marie Birner
|
3467e02748
|
[BUGFIX] color label dark-mode
|
2023-11-09 19:37:46 +01:00 |
|
|
philipp
|
e0fc5eb795
|
Merge branch 'default-boat-dest' into 'main'
Default boat dest
See merge request PhilippHofer/rot!94
|
2023-11-09 09:42:06 +00:00 |
|
|
philipp
|
b4e7a5f28b
|
Merge branch 'default-boat-dest' into 'staging'
implement default destination for boats
See merge request PhilippHofer/rot!93
|
2023-11-09 08:26:41 +00:00 |
|
|
philipp
|
8f3774dfc1
|
fix tests
|
2023-11-09 09:13:32 +01:00 |
|
|
philipp
|
d1edec2833
|
fix db
|
2023-11-09 08:58:09 +01:00 |
|
|
philipp
|
715fae59fc
|
implement default destination for boats
|
2023-11-09 08:56:08 +01:00 |
|
|
philipp
|
00f74ffb10
|
Merge branch 'staging' into 'main'
Staging
See merge request PhilippHofer/rot!92
|
2023-11-09 06:46:41 +00:00 |
|
|
philipp
|
ed0989e2a1
|
Merge branch 'dark-mode' into 'staging'
Dark mode
See merge request PhilippHofer/rot!91
|
2023-11-09 06:31:30 +00:00 |
|
|
philipp
|
6fbda666d5
|
Merge branch 'staging' into 'main'
Staging
See merge request PhilippHofer/rot!90
|
2023-11-09 06:30:49 +00:00 |
|
|
philipp
|
f1661f9eab
|
Merge branch 'new-rocket' into 'main'
New rocket
See merge request PhilippHofer/rot!87
|
2023-11-09 06:25:50 +00:00 |
|
|
philipp
|
8f45724848
|
Merge branch 'input-val' into 'main'
Input val
See merge request PhilippHofer/rot!89
|
2023-11-09 06:25:37 +00:00 |
|
|
philipp
|
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 |
|
|
philipp
|
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 |
|
|
philipp
|
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 |
|
|
philipp
|
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 |
|
|
philipp
|
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 |
|
|
philipp
|
e7a6d57bf0
|
simple (client only) val
|
2023-11-08 18:00:27 +01:00 |
|
|
philipp
|
144bcefcab
|
update deps, switch to newest rocket version
|
2023-11-08 17:39:39 +01:00 |
|
|
philipp
|
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 |
|
|
philipp
|
61cc470e0f
|
also allow dozen updates
|
2023-11-07 22:01:34 +01:00 |
|
|
philipp
|
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 |
|
|
philipp
|
4f4c053d0e
|
ergo-admin-edit
|
2023-11-07 21:27:40 +01:00 |
|
|
philipp
|
c0cefd82b6
|
slightly change labels
|
2023-11-07 20:53:45 +01:00 |
|
|
philipp
|
7c684a30f7
|
update deps; allow gallery image select
|
2023-11-07 20:49:22 +01:00 |
|
|
philipp
|
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 |
|
|
philipp
|
020ecfb154
|
Merge branch 'fix-rower-select-error' into 'staging'
push
See merge request PhilippHofer/rot!80
|
2023-11-04 15:40:47 +00:00 |
|
|
philipp
|
0f8c7a365e
|
push
|
2023-11-04 16:27:17 +01:00 |
|
|
philipp
|
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 |
|
|
philipp
|
c2034ed690
|
show proper amount of guests (changed bc cox is now included in rowers)
|
2023-11-04 15:07:16 +01:00 |
|