Commit Graph

1756 Commits

Author SHA1 Message Date
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
Marie Birner
d07581aa3d [TASK] replace Freitag with Markttag for phipsi 2023-09-05 13:19:44 +02:00
31435e9c3b rename labels 2023-08-09 23:39:11 +02:00
662f952807 Merge branch 'allow_to_add_real_guests' into 'staging'
Allow to add real guests

See merge request PhilippHofer/rot!28
2023-08-09 20:30:37 +00:00
590b41aa33 Allow to add real guests 2023-08-09 20:30:37 +00:00
723ada09b0 update deps 2023-08-09 13:43:51 +02:00
4acefb3749 fix typo 2023-08-09 12:43:30 +02:00
5deece48ea Merge branch 'staging' into 'main'
Staging

See merge request PhilippHofer/rot!27
2023-08-09 10:15:38 +00:00
0afd523e05 update faq 2023-08-09 12:01:49 +02:00
bd4ee5954c implement is_locked for trip_details 2023-08-09 11:54:18 +02:00
21c5609b31 set test logbook data 2023-08-05 16:58:20 +02:00
f0c6bdac14 fix ci; clean code 2023-08-05 16:29:58 +02:00
94a9d285be clean db 2023-08-05 16:27:51 +02:00
64aefde8bc fix stat query 2023-08-05 15:58:17 +02:00
7309b1f2b2 update unit tests; add location name in kiosk settting to cookie (to avoid specific redirects) 2023-08-05 13:21:35 +02:00
e459a4e2d9 store loation in kiosk cookie, to avoid having to handle each location separately 2023-08-05 13:09:58 +02:00
351ba1ba4e fix tests, default redirect to linz kiosk 2023-08-05 13:01:01 +02:00