Commit Graph

360 Commits

Author SHA1 Message Date
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
61cc470e0f also allow dozen updates 2023-11-07 22:01:34 +01:00
4f4c053d0e ergo-admin-edit 2023-11-07 21:27:40 +01:00
c0cefd82b6 slightly change labels 2023-11-07 20:53:45 +01:00
7c684a30f7 update deps; allow gallery image select 2023-11-07 20:49:22 +01:00
Marie Birner
8123299861 [BUGFIX] login screen dark mode 2023-11-04 20:51:03 +01:00
Marie Birner
895492946c [TASK] add color switch option btn 2023-11-04 20:16:20 +01:00
Marie Birner
b465923fa9 [TASK] support dark mode second draft 2023-11-04 19:45:57 +01:00
Marie Birner
97897437a9 [TASK] support dark mode second draft 2023-11-04 19:33:36 +01:00
Marie Birner
2fd053efed Merge commit 'bc9c5198d1a1df7526ee95de9411f8e7d0a60894' into dark-mode 2023-11-04 17:25:14 +01:00
0f8c7a365e push 2023-11-04 16:27:17 +01:00
c2034ed690 show proper amount of guests (changed bc cox is now included in rowers) 2023-11-04 15:07:16 +01:00
Marie Birner
5f494dc9e9 [TASK] support dark mode first draft 2023-11-04 00:19:46 +01:00
Marie Birner
c4e3c836e2 [TASK] guest user menu ergo 2023-11-03 14:35:15 +01:00
Marie Birner
150a86c2f1 Merge commit '95e1ea302884fa1214950b6c4005525f7469ac58' into ergo-styling 2023-11-03 14:31:14 +01:00
Marie Birner
8014dba27e [TASK] guest user menu ergo 2023-11-03 14:30:43 +01:00
95e1ea3028 allow guests to see + upload ergo entries; show ergo menu item for guests 2023-11-03 14:20:58 +01:00
Marie Birner
1522531baa [TASK] styling ergo challenge screen 2023-11-03 10:52:30 +01:00
f5ad37a0bb auto select owner as rower of private boat, Fixes #46 2023-11-02 19:50:19 +01:00
eb0f3ba9d8 clearer label 2023-11-02 19:32:16 +01:00
2767e2fe25 better label 2023-11-02 15:34:21 +01:00
50de29284f disable reload on ergo page; allow camera capture 2023-11-02 13:50:34 +01:00
2bff02f43a ergo: default own person 2023-11-02 13:19:21 +01:00
728d87ab05 show own data + add gitignore folder 2023-11-02 13:17:33 +01:00
1ff050a247 add ergo tool 2023-11-02 12:15:10 +01:00
Marie Birner
d805f6c1cd [BUGFIX] stat wording and search string 2023-10-31 21:57:31 +01:00
Marie Birner
4179b7bd6b [TASK] declutter end trip view 2023-10-31 21:43:25 +01:00
Marie Birner
8a3cd8d688 [BUGFIX] relationship destination and distance 2023-10-31 21:04:38 +01:00
Marie Birner
dc4eddc044 Merge commit 'ef0965fad12c402e14fad64f3ece50fca3cb9638' into staging 2023-10-31 20:58:38 +01:00
Marie Birner
3c7f56e94f [TASK] beautify Steuerperson/Schiffsführer tag in list view 2023-10-31 20:57:28 +01:00
ef0965fad1 Merge branch 'boat-stats' into 'staging'
Boat stats

See merge request PhilippHofer/rot!61
2023-10-31 19:42:42 +00:00
aed8e7d5c3 use names that also m enjoys seeing 2023-10-31 20:29:33 +01:00
8479d0c70b fix link 2023-10-31 20:25:12 +01:00
abe4a68c23 Merge branch 'boat-stats' into 'staging'
also show in kiosk mode

See merge request PhilippHofer/rot!60
2023-10-31 17:35:54 +00:00
fe5ba9020d also show in kiosk mode 2023-10-31 18:22:34 +01:00
a6519d7b7b Merge branch 'boat-stats' into 'staging'
add boat stats Fixes #50

Closes #50

See merge request PhilippHofer/rot!58
2023-10-31 15:20:36 +00:00
730f9e5dff add boat stats Fixes #50 2023-10-31 16:07:15 +01:00
388ed175bd finish frontend(?) 2023-10-30 15:32:17 +01:00
7788be5a17 use proper names for new form fields 2023-10-30 15:32:17 +01:00
2d520298e7 frontend for new db 2023-10-30 15:32:17 +01:00
e256d7274d use proper names for new form fields 2023-10-30 15:32:17 +01:00
ccc9f76691 do proper things in ui @ new log 2023-10-30 15:32:17 +01:00
Marie Birner
a8c43cbf40 [BUGFIX] add cursor-pointer boats 2023-10-30 09:43:20 +01:00
bc4512acc1 fix invalid link in kiosk mode 2023-10-26 22:11:17 +02:00
Marie Birner
f7e499d135 [BUGFIX] truncate username 2023-10-24 15:28:06 +02:00
ff6184e343 fix boat update error 2023-10-24 14:44:31 +02:00
e9641e6a33 move faq to wiki 2023-10-24 14:24:33 +02:00
beb5f3a217 hide logbook for guests 2023-10-24 10:57:51 +02:00
1f35be88ad scheckbuch can't see logbuch 2023-10-24 10:16:26 +02:00
1c75b478e3 show logbuch to everyone 2023-10-24 09:22:07 +02:00
Marie Birner
52b245b14e [TASK] correct sorting verified and style input / btn combi 2023-10-23 22:36:57 +02:00
f4d0a88575 merge 2023-10-23 22:00:04 +02:00
Marie Birner
da29d5dcdc [TASK] style delete button in logbook 2023-10-23 21:53:43 +02:00
fc42559f1b show amount of guests 2023-10-23 21:44:39 +02:00
Marie Birner
547cab368c [TASK] style header kiosk mode 2023-10-23 21:43:01 +02:00
88af24db7b allow all users to report boat damage 2023-10-23 21:38:08 +02:00
6f9edfa23f show header in kiosk mode 2023-10-23 21:05:59 +02:00
3e327e98f1 allow editing of boat damages 2023-10-12 12:05:12 +02:00
8852e1cdd6 allow boatdamage add in kiosk mode 2023-10-04 13:56:58 +02:00
e67b345789 allow showing stat in kiosk mode 2023-10-01 20:52:42 +02:00
Marie Birner
79c378a887 [WIP] typescript 2023-10-01 20:52:42 +02:00
d838a1ca68 allow deletion of logs 2023-10-01 20:52:42 +02:00
Marie Birner
c8a06f55aa [TASK] move code to js / css 2023-10-01 20:52:42 +02:00
af81920a47 fake personal history 2023-10-01 20:52:42 +02:00
8a75ba4335 wurking 2023-10-01 20:52:42 +02:00
877df86f0d maybe a bit better? 2023-10-01 20:52:42 +02:00
Marie Birner
f176c9e43e [TASK] not working chart 2023-10-01 20:52:42 +02:00
e41aa9b4e7 fun with timezones 2023-10-01 20:52:41 +02:00
Marie Birner
c4028d5f25 [TASK] streamline width of boatdamage container 2023-10-01 20:52:41 +02:00
Marie Birner
d65ce90fce [TASK] styling boat form 2023-10-01 20:52:41 +02:00
Marie Birner
9fbd3d970b [TASK] style boat damage screen 2023-10-01 20:52:41 +02:00
Marie Birner
a544d5d060 [TASK] style boat screen 2023-10-01 20:52:41 +02:00
Marie Birner
8cec4e4c11 [TASK] refactor steering checkbox 2023-10-01 20:52:41 +02:00
Marie Birner
2ae01c0c65 [TASK] refactor select 2023-10-01 20:52:41 +02:00
Marie Birner
f46e6b47c7 [TASK] text no boats on water 2023-10-01 20:52:41 +02:00
Marie Birner
fedbc00dc5 [TASK] add label for logtype 2023-10-01 20:52:41 +02:00
Marie Birner
1d9d7bbbb8 [TASK] change style of boats on water 2023-10-01 20:52:41 +02:00
Marie Birner
2616c19bd4 [TASK] improve white space entries logbook 2023-10-01 20:52:41 +02:00
Marie Birner
ed4bf67982 [BUGFIX] km issue relation destination 2023-10-01 20:52:41 +02:00
Marie Birner
3cb14835cc [TASK] improve log and stats look & feel 2023-10-01 20:52:41 +02:00
Marie Birner
97df1f16a4 [TASK] add current place to stats 2023-10-01 20:52:41 +02:00
Marie Birner
90713b4e3d [BUGFIX] wordings 2023-10-01 20:52:41 +02:00
Marie Birner
c69289504b [TASK] basic styling logbook and stats 2023-10-01 20:52:41 +02:00
Marie Birner
46d50668ee [TASK] streamline form 2023-10-01 20:52:41 +02:00
Marie Birner
c2e0c874ad [BUGFIX] header menu logbook styling 2023-10-01 20:52:41 +02:00
09af9981df fix multi-select; only show private boats owner + kiosk 2023-10-01 20:52:41 +02:00
514561321e change select properly if boat is selected on the left 2023-10-01 20:52:41 +02:00
Marie Birner
78d169e056 [TASK] fix alert issues styling 2023-10-01 20:52:41 +02:00
Marie Birner
2e5b913c8c [TASK] select boat on click 2023-10-01 20:52:41 +02:00
Marie Birner
97ef19513e [TASK] change styling choice.js 2023-10-01 20:52:41 +02:00
d102e57b09 disable rowers in logbook if they are on water 2023-10-01 20:52:41 +02:00
Marie Birner
cbe77ebf0e [TASK] fix issues with destination 2023-10-01 20:52:41 +02:00
Marie Birner
17422a78a0 [TASK] improve rower select 2023-10-01 20:52:41 +02:00
Marie Birner
e3012be264 [TASK] add working choices.js 2023-10-01 20:52:41 +02:00
Marie Birner
5e097a95da [TASK] [NPM] install choices.js (styling copy & paste) 2023-10-01 20:52:41 +02:00
fe4c0bebfc
Staging 2023-09-05 21:03:18 +00:00
31435e9c3b rename labels 2023-08-09 23:39:11 +02:00
590b41aa33 Allow to add real guests 2023-08-09 20:30:37 +00:00
4acefb3749 fix typo 2023-08-09 12:43:30 +02:00