Commit Graph

1822 Commits

Author SHA1 Message Date
a2c91b784a Merge branch 'select-dataset-issue' into 'staging'
Select dataset issue

See merge request PhilippHofer/rot!35
2023-09-24 09:44:44 +00:00
c48fd1d87d fix ci 2023-09-24 11:32:01 +02:00
93a6b81803 change select properly if boat is selected on the left 2023-09-24 11:19:10 +02:00
Marie Birner
1ea46760af [BUGFIX] reset rowers 2023-09-24 10:50:25 +02:00
Marie Birner
f3b0c74bbc [BUGFIX] issues with option create 2023-09-24 10:47:18 +02:00
Marie Birner
72f172e4a2 [ISSUE] choices.js dataset lost 2023-09-24 10:32:38 +02:00
3c040fc979 allow users to delete trips 2023-09-24 09:55:51 +02:00
0558b0458c verify that arrivaldate > departuredate 2023-09-24 09:48:01 +02:00
03880af865 error if same person selected as cox + rower 2023-09-24 09:12:27 +02:00
Marie Birner
82a53cf1fc [TASK] fix alert issues styling 2023-09-23 23:44:03 +02:00
Marie Birner
f392e83af3 [TASK] select boat on click 2023-09-23 23:23:42 +02:00
Marie Birner
a186b96c67 [TASK] change styling choice.js 2023-09-23 22:58:15 +02:00
Marie Birner
03f31a89b6 Merge commit '36d84e8157bb54c3cc215ca588a46e3d3a4cf0df' into staging 2023-09-23 22:31:32 +02:00
Marie Birner
eb1b3f412f [TASK] fix issues with destination 2023-09-23 22:31:19 +02:00
36d84e8157 disable rowers in logbook if they are on water 2023-09-23 22:13:48 +02:00
Marie Birner
33cb5e025b [TASK] improve rower select 2023-09-23 21:51:00 +02:00
Marie Birner
c0366edbe1 [TASK] add working choices.js 2023-09-23 21:05:08 +02:00
Marie Birner
2abd483a3f [TASK] [NPM] install choices.js (styling copy & paste) 2023-09-23 19:19:28 +02:00
5730d27149 fix ci 2023-09-23 18:26:04 +02:00
c6a8866207 add debug trait; switch to proper name of form field (rowerS) 2023-09-23 18:12:48 +02:00
9bb2996a4d make admin cox by default 2023-09-23 17:40:17 +02:00
528477e728 update deps 2023-09-22 08:00:08 +02:00
6e1bc101bf clean code with clippy 2023-09-06 14:39:36 +02:00
ba3a552def
Merge branch 'staging' into 'main'
Staging

See merge request PhilippHofer/rot!34
2023-09-05 21:03:18 +00:00
fe4c0bebfc
Staging 2023-09-05 21:03:18 +00:00
16da28561e
Merge branch 'refactor-code' into 'staging'
Refactor code

See merge request PhilippHofer/rot!32
2023-09-05 20:48:02 +00:00
a1dc92defd
Refactor code 2023-09-05 20:48:02 +00:00
cbfc6be0e9
Merge branch 'staging' into 'main'
Staging

See merge request PhilippHofer/rot!33
2023-09-05 20:32:20 +00:00
709411ce5c remove deprecated function 2023-09-05 16:13:36 +02:00
bebe89d21b
Merge branch 'upgrade-deps' into 'staging'
update deps

See merge request PhilippHofer/rot!31
2023-09-05 14:01:27 +00:00
f846d78b6c
Merge branch 'funny-replace' into 'staging'
Funny replace

See merge request PhilippHofer/rot!29
2023-09-05 13:59:33 +00:00
608adc9779 Merge branch 'upgrade-deps' of gitlab.com:PhilippHofer/rot into upgrade-deps 2023-09-05 15:47:43 +02:00
7dc1964de3 update deps 2023-09-05 15:47:34 +02:00
dae59e4246 Merge branch 'funny-replace' of gitlab.com:PhilippHofer/rot into funny-replace 2023-09-05 15:46:41 +02:00
16ca1a3482 don't be too funny 2023-09-05 15:46:36 +02:00
Marie Birner
36d86b079b [TASK] replace Freitag with Markttag for phipsi 2023-09-05 15:46:09 +02:00
4ef88ba6c5 don't be too funny 2023-09-05 15:44:50 +02:00
Marie Birner
c06173d04b [TASK] replace Freitag with Markttag for phipsi 2023-09-05 15:44:50 +02:00
e6daa99974 fix order ci 2023-09-05 13:54:03 +02:00
22fbc715ec Merge branch 'funny-replace' of gitlab.com:PhilippHofer/rot into funny-replace 2023-09-05 13:44:37 +02:00
ac728dc203 don't be too funny 2023-09-05 13:44:33 +02:00
Marie Birner
df26112820 [TASK] replace Freitag with Markttag for phipsi 2023-09-05 13:44:07 +02:00
21eef385d8 Merge branch 'upgrade-deps' of gitlab.com:PhilippHofer/rot into upgrade-deps 2023-09-05 13:43:47 +02:00
6e68e71369 update deps 2023-09-05 13:43:40 +02:00
c23d22d027 install npm 2023-09-05 13:41:11 +02:00
39a9347bab use new nodejs 2023-09-05 13:38:53 +02:00
6bdb2610bd update deps 2023-09-05 13:28:30 +02:00
71ec5ce01a
Merge branch 'staging' into 'main'
Staging

See merge request PhilippHofer/rot!30
2023-09-05 11:27:30 +00:00
689ff36534 don't be too funny 2023-09-05 13:21:18 +02:00
c5f3c8d1f3 push 2023-09-05 13:20:42 +02:00