Commit Graph

1447 Commits

Author SHA1 Message Date
cf257c5f65 push
Some checks reported warnings
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
CI/CD Pipeline / build (push) Has been cancelled
2023-11-18 21:18:07 +01:00
ffb437e1f4 push
Some checks failed
CI/CD Pipeline / build (push) Successful in 14m45s
CI/CD Pipeline / test (push) Failing after 9m0s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-11-18 20:47:21 +01:00
0ec49ea264 push
Some checks failed
CI/CD Pipeline / build (push) Successful in 14m41s
CI/CD Pipeline / test (push) Failing after 7m31s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-11-18 20:23:07 +01:00
5c30fa3cfa switch to gitea
Some checks failed
CI/CD Pipeline / build (push) Successful in 14m46s
CI/CD Pipeline / test (push) Failing after 4s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-11-18 20:02:23 +01:00
53ed032c25 Merge branch 'staging' into 'log-2022'
# Conflicts:
#   src/model/logbook.rs
2023-11-18 11:22:50 +00:00
f001aaf90f add routes for different years 2023-11-18 12:21:37 +01:00
e053ff96cf migrate 2022 entries 2023-11-18 12:03:31 +01:00
f28a66b11e Merge branch 'no-data-mangling' into 'staging'
don't allow to add entry which is not completed today

See merge request PhilippHofer/rot!116
2023-11-16 14:50:39 +00:00
a87832e4f4 update tests to use current date 2023-11-16 15:36:38 +01:00
5b4238da92 update tests to use current date 2023-11-16 15:35:52 +01:00
2c0057ca44 Merge branch 'ergo-again' into 'main'
link new urls + fix typo

See merge request PhilippHofer/rot!121
2023-11-16 14:24:43 +00:00
5c7cd58edc Merge branch 'ergo-again' into 'staging'
Ergo again

See merge request PhilippHofer/rot!120
2023-11-16 14:00:41 +00:00
b361fbbe50 link new urls + fix typo 2023-11-16 14:46:40 +01:00
30bc29e987 Merge branch 'ergo-links' into 'staging'
use new fancy rudernlinz links

See merge request PhilippHofer/rot!119
2023-11-15 17:48:49 +00:00
aefa625524 merge 2023-11-15 18:35:33 +01:00
b28ffea0a9 Merge branch 'ergo-style' into 'main'
[TASK] ergo styling

See merge request PhilippHofer/rot!115
2023-11-15 17:31:00 +00:00
59b5b1bf97 use new fancy rudernlinz links 2023-11-15 18:27:46 +01:00
a3c7461c2b don't allow to add entry which is not completed today 2023-11-14 23:09:33 +01:00
Marie Birner
e1b9cdcd3b Merge branch 'ergo-style' into staging 2023-11-14 11:49:08 +01:00
Marie Birner
19fc50d711 [TASK] ergo styling 2023-11-14 11:48:33 +01:00
bcd275fc3e Merge branch 'save-ergo-imgs' into 'main'
add timestamp to save imgs

See merge request PhilippHofer/rot!114
2023-11-12 20:41:31 +00:00
7baa47d859 Merge branch 'save-ergo-imgs' into 'staging'
add timestamp to save imgs

See merge request PhilippHofer/rot!113
2023-11-12 20:41:31 +00:00
844e2c1f8c add timestamp to save imgs 2023-11-12 21:28:06 +01:00
9749d0a6df Merge branch 'ergo-desc' into 'main'
add notes about ergo challenge

See merge request PhilippHofer/rot!97
2023-11-12 18:25:55 +00:00
56163a4732 Merge branch 'finalize-ergo' into 'staging'
push

See merge request PhilippHofer/rot!111
2023-11-12 14:35:57 +00:00
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