Commit Graph

  • 7e02c840b4 Merge branch 'bugfix-label' into staging Marie Birner 2023-11-09 19:40:56 +01:00
  • 609483f1df [BUGFIX] color text and btn dark-mode Marie Birner 2023-11-09 19:40:41 +01:00
  • cdc42d7154 [BUGFIX] color text dark-mode Marie Birner 2023-11-09 19:39:23 +01:00
  • 88c99b0898 Merge branch 'bugfix-label' into staging Marie Birner 2023-11-09 19:38:09 +01:00
  • 3467e02748 [BUGFIX] color label dark-mode Marie Birner 2023-11-09 19:37:46 +01:00
  • e0fc5eb795 Merge branch 'default-boat-dest' into 'main' PhilippHofer 2023-11-09 09:42:06 +00:00
  • b4e7a5f28b Merge branch 'default-boat-dest' into 'staging' PhilippHofer 2023-11-09 08:26:41 +00:00
  • 8f3774dfc1 fix tests philipp 2023-11-09 09:13:32 +01:00
  • d1edec2833 fix db philipp 2023-11-09 08:58:09 +01:00
  • 715fae59fc implement default destination for boats philipp 2023-11-09 08:56:08 +01:00
  • 00f74ffb10 Merge branch 'staging' into 'main' PhilippHofer 2023-11-09 06:46:41 +00:00
  • ed0989e2a1 Merge branch 'dark-mode' into 'staging' PhilippHofer 2023-11-09 06:31:30 +00:00
  • 6fbda666d5 Merge branch 'staging' into 'main' PhilippHofer 2023-11-09 06:30:49 +00:00
  • f1661f9eab Merge branch 'new-rocket' into 'main' PhilippHofer 2023-11-09 06:25:50 +00:00
  • 8f45724848 Merge branch 'input-val' into 'main' PhilippHofer 2023-11-09 06:25:37 +00:00
  • 63c7a27131 Merge branch 'ergo-admin-edit' into 'main' PhilippHofer 2023-11-09 05:53:18 +00:00
  • 1dd30f9c75 Merge branch 'brighter-black' into 'dark-mode' PhilippHofer 2023-11-09 05:52:36 +00:00
  • ae0a1121d4 Merge branch 'input-val' into 'staging' PhilippHofer 2023-11-08 17:16:02 +00:00
  • ae7391e239 Merge branch 'new-rocket' into 'staging' PhilippHofer 2023-11-08 17:03:25 +00:00
  • 04958d80a4 Merge branch 'staging' into 'input-val' PhilippHofer 2023-11-08 17:02:32 +00:00
  • e7a6d57bf0 simple (client only) val philipp 2023-11-08 18:00:27 +01:00
  • 144bcefcab update deps, switch to newest rocket version philipp 2023-11-08 17:39:39 +01:00
  • 6db40f4d79 Merge branch 'ergo-admin-edit' into 'staging' PhilippHofer 2023-11-07 21:15:04 +00:00
  • 61cc470e0f also allow dozen updates philipp 2023-11-07 22:01:34 +01:00
  • 3c20a3dc6a Merge branch 'ergo-admin-edit' into 'staging' PhilippHofer 2023-11-07 20:41:17 +00:00
  • 4f4c053d0e ergo-admin-edit philipp 2023-11-07 21:27:40 +01:00
  • c0cefd82b6 slightly change labels philipp 2023-11-07 20:53:45 +01:00
  • 7c684a30f7 update deps; allow gallery image select philipp 2023-11-07 20:49:22 +01:00
  • 7bd07b911a use a slightly brighter black philipp 2023-11-07 15:31:06 +01:00
  • 48f26a1379 Merge branch 'dark-mode' into staging Marie Birner 2023-11-04 20:53:29 +01:00
  • 8123299861 [BUGFIX] login screen dark mode Marie Birner 2023-11-04 20:51:03 +01:00
  • e3ba0a033a Merge branch 'dark-mode' into staging Marie Birner 2023-11-04 20:17:49 +01:00
  • 895492946c [TASK] add color switch option btn Marie Birner 2023-11-04 20:16:20 +01:00
  • b465923fa9 [TASK] support dark mode second draft Marie Birner 2023-11-04 19:45:57 +01:00
  • 97897437a9 [TASK] support dark mode second draft Marie Birner 2023-11-04 19:33:36 +01:00
  • 2fd053efed Merge commit 'bc9c5198d1a1df7526ee95de9411f8e7d0a60894' into dark-mode Marie Birner 2023-11-04 17:25:14 +01:00
  • bc9c5198d1 Merge branch 'fix-rower-select-error' into 'main' Marie Birner 2023-11-04 16:19:54 +00:00
  • 020ecfb154 Merge branch 'fix-rower-select-error' into 'staging' PhilippHofer 2023-11-04 15:40:47 +00:00
  • 0f8c7a365e push philipp 2023-11-04 16:27:17 +01:00
  • 9de2a615a6 Merge branch 'show-proper-amount-guests' into 'staging' PhilippHofer 2023-11-04 14:39:43 +00:00
  • c2034ed690 show proper amount of guests (changed bc cox is now included in rowers) philipp 2023-11-04 15:07:16 +01:00
  • 5f494dc9e9 [TASK] support dark mode first draft Marie Birner 2023-11-04 00:19:46 +01:00
  • 555882b4c7 Merge branch 'ergo-styling' into 'staging' PhilippHofer 2023-11-03 13:48:16 +00:00
  • c4e3c836e2 [TASK] guest user menu ergo Marie Birner 2023-11-03 14:35:15 +01:00
  • 150a86c2f1 Merge commit '95e1ea302884fa1214950b6c4005525f7469ac58' into ergo-styling Marie Birner 2023-11-03 14:31:14 +01:00
  • 8014dba27e [TASK] guest user menu ergo Marie Birner 2023-11-03 14:30:43 +01:00
  • 95e1ea3028 allow guests to see + upload ergo entries; show ergo menu item for guests philipp 2023-11-03 14:20:58 +01:00
  • 5ac3ae348c Merge branch 'ergo-styling' into 'main' PhilippHofer 2023-11-03 11:21:00 +00:00
  • a1d7bd8269 Merge branch 'ergo-styling' into 'staging' Marie Birner 2023-11-03 10:05:52 +00:00
  • 1522531baa [TASK] styling ergo challenge screen Marie Birner 2023-11-03 10:52:30 +01:00
  • 7bdaceaafe Merge branch 'auto-select-owner' into 'main' Marie Birner 2023-11-03 07:11:15 +00:00
  • 9331b2001d improve code with clippy philipp 2023-11-02 22:19:13 +01:00
  • 1b58641100 Merge branch 'auto-select-owner' into 'staging' PhilippHofer 2023-11-02 19:04:23 +00:00
  • f5ad37a0bb auto select owner as rower of private boat, Fixes #46 philipp 2023-11-02 19:50:19 +01:00
  • 650e96cccd Merge branch 'staging' into 'main' PhilippHofer 2023-11-02 18:47:34 +00:00
  • d9322c9702 Merge branch 'staging' of gitlab.com:PhilippHofer/rot into staging philipp 2023-11-02 19:32:24 +01:00
  • eb0f3ba9d8 clearer label philipp 2023-11-02 19:32:16 +01:00
  • a9ded48feb Merge branch 'minor' into 'staging' PhilippHofer 2023-11-02 18:16:17 +00:00
  • 0bbedfc9cc remove staging diff as it's deployed philipp 2023-11-02 19:11:23 +01:00
  • 77faf30475 push philipp 2023-11-02 19:03:01 +01:00
  • 71da6546b0 image required; cleaner log philipp 2023-11-02 18:59:33 +01:00
  • a9ca715d6d push philipp 2023-11-02 19:01:13 +01:00
  • 27e40783e1 image required; cleaner log philipp 2023-11-02 18:59:33 +01:00
  • c11b73b7e6 remove db migration as ergo changes are in prod. philipp 2023-11-02 18:33:30 +01:00
  • cd611cf251 Merge branch 'ergo' into 'main' PhilippHofer 2023-11-02 17:26:45 +00:00
  • eddcdf292f Merge branch 'ergo' into 'staging' PhilippHofer 2023-11-02 15:01:09 +00:00
  • 039f9fbddf switch order philipp 2023-11-02 16:00:41 +01:00
  • 4afed60f29 Merge branch 'ergo' into 'staging' PhilippHofer 2023-11-02 14:48:23 +00:00
  • 2767e2fe25 better label philipp 2023-11-02 15:34:21 +01:00
  • 6c3fd89b00 Merge branch 'ergo' into 'staging' PhilippHofer 2023-11-02 14:17:51 +00:00
  • 4726c25d20 migration + better ordering philipp 2023-11-02 15:04:08 +01:00
  • d5c88ef956 Merge branch 'ergo' into 'staging' PhilippHofer 2023-11-02 13:54:23 +00:00
  • 8cb9bb36c7 fix limits philipp 2023-11-02 14:40:26 +01:00
  • bf24c8aa9c Merge branch 'ergo' into 'staging' PhilippHofer 2023-11-02 13:04:12 +00:00
  • 50de29284f disable reload on ergo page; allow camera capture philipp 2023-11-02 13:50:34 +01:00
  • f7b24b4d50 Merge branch 'ergo' of gitlab.com:PhilippHofer/rot into ergo philipp 2023-11-02 13:19:38 +01:00
  • 2bff02f43a ergo: default own person philipp 2023-11-02 13:19:21 +01:00
  • 728d87ab05 show own data + add gitignore folder philipp 2023-11-02 12:58:50 +01:00
  • 41bdc73cfa fix deplox ci g philipp 2023-11-02 13:02:44 +01:00
  • cf2d599e16 fix deploy philipp 2023-11-02 13:01:19 +01:00
  • 25eabefd43 show own data + add gitignore folder philipp 2023-11-02 12:58:50 +01:00
  • 07c9ac8a31 Merge branch 'ergo' into 'staging' PhilippHofer 2023-11-02 11:45:07 +00:00
  • e1a7bdae65 fix ci philipp 2023-11-02 12:25:13 +01:00
  • dc3e5555df push philipp 2023-11-02 12:15:54 +01:00
  • 1ff050a247 add ergo tool philipp 2023-11-02 12:15:10 +01:00
  • 2eba6a0f66 more rights to the kiosk! philipp 2023-10-31 22:41:12 +01:00
  • 7a622a5615 Merge branch 'staging' of gitlab.com:PhilippHofer/rot into staging philipp 2023-10-31 22:16:51 +01:00
  • 56ae0ae429 fix 1x no cox stuff philipp 2023-10-31 22:16:14 +01:00
  • d805f6c1cd [BUGFIX] stat wording and search string Marie Birner 2023-10-31 21:57:31 +01:00
  • 4179b7bd6b [TASK] declutter end trip view Marie Birner 2023-10-31 21:43:25 +01:00
  • 2bd5d76c2f Merge branch 'staging' of gitlab.com:PhilippHofer/rot into staging Marie Birner 2023-10-31 21:12:23 +01:00
  • ea1041aa73 fix node ci philipp 2023-10-31 21:08:57 +01:00
  • 8a3cd8d688 [BUGFIX] relationship destination and distance Marie Birner 2023-10-31 21:04:38 +01:00
  • 2d7c86f323 aaaaah philipp 2023-10-31 21:02:56 +01:00
  • dc4eddc044 Merge commit 'ef0965fad12c402e14fad64f3ece50fca3cb9638' into staging Marie Birner 2023-10-31 20:58:38 +01:00
  • 3c7f56e94f [TASK] beautify Steuerperson/Schiffsführer tag in list view Marie Birner 2023-10-31 20:57:28 +01:00
  • d9c7c218bc allow no cox in 1x; require them in >2x philipp 2023-10-31 20:57:05 +01:00
  • e428d01ea8 Merge branch 'boat-stats' into 'main' Marie Birner 2023-10-31 19:42:42 +00:00
  • ef0965fad1 Merge branch 'boat-stats' into 'staging' PhilippHofer 2023-10-31 19:42:42 +00:00
  • aed8e7d5c3 use names that also m enjoys seeing philipp 2023-10-31 20:29:33 +01:00