Commit Graph

1672 Commits

Author SHA1 Message Date
3e9e257153 Merge branch 'finalize-ergo' into 'main'
push

See merge request PhilippHofer/rot!112
2023-11-12 14:35:57 +00:00
55fc8b6db1 push 2023-11-12 15:22:30 +01:00
b4dfd00636 Merge branch 'default-dist' into 'main'
Default dist

See merge request PhilippHofer/rot!110
2023-11-12 13:18:40 +00:00
be52b0daf5 Merge branch 'default-dist' into 'staging'
refactor(main.ts): refactor selectBoatChange and initNewChoice functions

See merge request PhilippHofer/rot!109
2023-11-12 12:46:47 +00:00
77c888cf13 fix ci 2023-11-12 13:33:39 +01:00
34775ace90 refactor(main.ts): refactor selectBoatChange and initNewChoice functions 2023-11-12 13:27:27 +01:00
71de2c7665 Merge branch 'fix-direct-add' into 'main'
fix

See merge request PhilippHofer/rot!108
2023-11-10 16:09:07 +00:00
bfd9178d82 Merge branch 'fix-direct-add' into 'staging'
Fix direct add

See merge request PhilippHofer/rot!107
2023-11-10 16:09:07 +00:00
f4a278030f fix 2023-11-10 16:55:57 +01:00
65edd4caa8 Merge branch 'ergo-desc' into 'staging'
Ergo desc

See merge request PhilippHofer/rot!106
2023-11-10 12:24:55 +00:00
8dc38a4fc0 improve text 2023-11-10 13:11:46 +01:00
fee89b0f19 fix link 2023-11-10 13:10:46 +01:00
23a21b55c7 Merge branch 'new-people' into 'staging'
improve text

See merge request PhilippHofer/rot!101
2023-11-10 09:30:56 +00:00
5c3be25285 Merge branch 'ergo-desc' into 'staging'
more concise

See merge request PhilippHofer/rot!100
2023-11-10 09:30:52 +00:00
9983d0f14a Merge branch 'change-artifact-expiration' into 'main'
perf(expire_in): optimize expiration time

See merge request PhilippHofer/rot!103
2023-11-10 08:47:10 +00:00
f7c3fa01bc Merge branch 'change-artifact-expiration' into 'staging'
perf(expire_in): optimize expiration time

See merge request PhilippHofer/rot!102
2023-11-10 08:47:10 +00:00
956951d228 perf(expire_in): optimize expiration time 2023-11-10 09:14:01 +01:00
e5f6a543e1 improve text 2023-11-10 09:03:04 +01:00
b929c757ce more concise 2023-11-10 08:56:36 +01:00
87b5cff190 Merge branch 'new-people' into 'staging'
New people

See merge request PhilippHofer/rot!98
2023-11-09 21:29:59 +00:00
9b86d93979 try to get new people 2023-11-09 22:02:31 +01:00
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
8926d82bd6 add notes about ergo challenge 2023-11-09 21:48:21 +01:00
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
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
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
8f3774dfc1 fix tests 2023-11-09 09:13:32 +01:00
d1edec2833 fix db 2023-11-09 08:58:09 +01:00
715fae59fc implement default destination for boats 2023-11-09 08:56:08 +01:00
00f74ffb10 Merge branch 'staging' into 'main'
Staging

See merge request PhilippHofer/rot!92
2023-11-09 06:46:41 +00:00
ed0989e2a1 Merge branch 'dark-mode' into 'staging'
Dark mode

See merge request PhilippHofer/rot!91
2023-11-09 06:31:30 +00:00
6fbda666d5 Merge branch 'staging' into 'main'
Staging

See merge request PhilippHofer/rot!90
2023-11-09 06:30:49 +00:00
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