|
|
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 |
|
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 |
|
|
|
f7b24b4d50
|
Merge branch 'ergo' of gitlab.com:PhilippHofer/rot into ergo
|
2023-11-02 13:19:38 +01:00 |
|
|
|
2bff02f43a
|
ergo: default own person
|
2023-11-02 13:19:21 +01:00 |
|
|
|
728d87ab05
|
show own data + add gitignore folder
|
2023-11-02 13:17:33 +01:00 |
|
|
|
41bdc73cfa
|
fix deplox ci g
|
2023-11-02 13:02:44 +01:00 |
|
|
|
cf2d599e16
|
fix deploy
|
2023-11-02 13:01:19 +01:00 |
|
|
|
25eabefd43
|
show own data + add gitignore folder
|
2023-11-02 12:58:50 +01:00 |
|
|
|
07c9ac8a31
|
Merge branch 'ergo' into 'staging'
Ergo
See merge request PhilippHofer/rot!62
|
2023-11-02 11:45:07 +00:00 |
|
|
|
e1a7bdae65
|
fix ci
|
2023-11-02 12:25:13 +01:00 |
|
|
|
dc3e5555df
|
push
|
2023-11-02 12:15:54 +01:00 |
|
|
|
1ff050a247
|
add ergo tool
|
2023-11-02 12:15:10 +01:00 |
|
|
|
2eba6a0f66
|
more rights to the kiosk!
|
2023-10-31 22:41:12 +01:00 |
|
|
|
7a622a5615
|
Merge branch 'staging' of gitlab.com:PhilippHofer/rot into staging
|
2023-10-31 22:16:51 +01:00 |
|
|
|
56ae0ae429
|
fix 1x no cox stuff
|
2023-10-31 22:16:14 +01:00 |
|
Marie Birner
|
d805f6c1cd
|
[BUGFIX] stat wording and search string
|
2023-10-31 21:57:31 +01:00 |
|
Marie Birner
|
4179b7bd6b
|
[TASK] declutter end trip view
|
2023-10-31 21:43:25 +01:00 |
|
Marie Birner
|
2bd5d76c2f
|
Merge branch 'staging' of gitlab.com:PhilippHofer/rot into staging
|
2023-10-31 21:12:23 +01:00 |
|
|
|
ea1041aa73
|
fix node ci
|
2023-10-31 21:08:57 +01:00 |
|
Marie Birner
|
8a3cd8d688
|
[BUGFIX] relationship destination and distance
|
2023-10-31 21:04:38 +01:00 |
|
