|
|
08202691f6
|
push
|
2023-11-19 22:02:25 +01:00 |
|
|
|
fea5b6f3d8
|
push
CI/CD Pipeline / test (push) Successful in 11m1s
CI/CD Pipeline / deploy-staging (push) Successful in 15m4s
CI/CD Pipeline / deploy-main (push) Has been skipped
|
2023-11-19 21:41:46 +01: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 |
|
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 |
|
|
|
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 |
|
|
|
55fc8b6db1
|
push
|
2023-11-12 15:22:30 +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 |
|
|
|
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 |
|
Marie Birner
|
8c5fbfec63
|
[BUGFIX] filter issues
|
2023-11-09 21:02:21 +01:00 |
|
Marie Birner
|
609483f1df
|
[BUGFIX] color text and btn dark-mode
|
2023-11-09 19:40:41 +01:00 |
|
Marie Birner
|
3467e02748
|
[BUGFIX] color label dark-mode
|
2023-11-09 19:37:46 +01:00 |
|
|
|
715fae59fc
|
implement default destination for boats
|
2023-11-09 08:56:08 +01: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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
2192bb73ed
|
Merge branch 'fix-order-trips' into 'staging'
fix order of displayed trips + events
See merge request PhilippHofer/rot!23
|
2023-08-05 10:38:58 +00:00 |
|
|
|
6809a85749
|
add option to lock boat on damage
|
2023-08-05 12:05:54 +02:00 |
|
|
|
ff31ad83fe
|
add boatdamages functionality
|
2023-08-02 14:29:19 +02:00 |
|
|
|
5b8dfb8284
|
fix order of displayed trips + events
|
2023-07-31 20:12:50 +02:00 |
|
|
|
dc4b4b3499
|
add tests; Closes #30
|
2023-07-31 16:25:07 +02:00 |
|
Marie Birner
|
9b270fbbf9
|
[TASK] show pretty timestamp
|
2023-07-30 20:53:27 +02:00 |
|
Marie Birner
|
041733a3ba
|
[TASK] set boat status
|
2023-07-30 20:45:16 +02:00 |
|
Marie Birner
|
fafe82b15a
|
[TASK] add status to boat
|
2023-07-30 20:02:46 +02:00 |
|
Marie Birner
|
80e57dfe12
|
[TASK] add multiselct js
|
2023-07-30 18:07:44 +02:00 |
|
Marie Birner
|
354e267a3a
|
[WIP] styling logbook page
|
2023-07-30 17:20:03 +02:00 |
|
Marie Birner
|
8de9568684
|
[WIP] styling logbook page
|
2023-07-30 16:59:20 +02:00 |
|
Marie Birner
|
e4376c29b4
|
Merge commit 'db3cf59d21a14ed87b6226484a1d7adb19322f64'
# Conflicts:
# templates/includes/forms/log.html.tera
# templates/kiosk.html.tera
|
2023-07-30 15:10:48 +02:00 |
|
Marie Birner
|
4d80421b9b
|
[WIP] styling kiosk page
|
2023-07-30 15:10:09 +02:00 |
|
|
|
db3cf59d21
|
format tera files
|
2023-07-30 14:33:50 +02:00 |
|
Marie Birner
|
2ff7e24cbd
|
[WIP] styling kiosk page
|
2023-07-30 14:31:15 +02:00 |
|
|
|
bf2135b1b3
|
fix typo
|
2023-07-30 14:16:58 +02:00 |
|
|
|
2e80f7bc38
|
add logbook history
|
2023-07-30 14:13:49 +02:00 |
|
|
|
c6d19d276c
|
show boats on water
|
2023-07-30 14:02:53 +02:00 |
|
|
|
c414164b82
|
push
|
2023-07-30 14:00:15 +02:00 |
|
|
|
039df224a6
|
first draft layout logbook
|
2023-07-30 13:42:33 +02:00 |
|
|
|
e49279afef
|
remove log from page
|
2023-07-30 13:02:29 +02:00 |
|
|
|
861df59ebc
|
set some fields to required
|
2023-07-28 10:25:57 +02:00 |
|
|
|
301d3527c1
|
fix planned_event creation
|
2023-07-27 22:41:01 +02:00 |
|
|
|
b5fd4018ff
|
extract common functionality to functoin
|
2023-07-27 15:24:29 +02:00 |
|
|
|
7093e29c9b
|
fix
|
2023-07-27 14:44:47 +02:00 |
|
|
|
38300d826a
|
add kiosk mode
|
2023-07-27 14:38:46 +02:00 |
|
|
|
b3349c87ff
|
don't show cox twice
|
2023-07-27 13:15:40 +02:00 |
|
|
|
d5c16ad7a0
|
allow non-cox to (only) use 1x
|
2023-07-27 13:07:00 +02:00 |
|
|
|
fad7d747d7
|
fixes
|
2023-07-27 12:31:53 +02:00 |
|
|
|
c37d9fa393
|
beautify frontend code
|
2023-07-27 12:24:38 +02:00 |
|
|
|
d2b162b397
|
push
|
2023-07-27 11:53:28 +02:00 |
|
|
|
a633239c84
|
push
|
2023-07-27 11:50:52 +02:00 |
|
|
|
6f8e977ecc
|
push
|
2023-07-27 11:47:34 +02:00 |
|
|
|
2707a8b17f
|
push
|
2023-07-27 11:45:57 +02:00 |
|
|
|
553bbf24cd
|
push
|
2023-07-27 11:43:10 +02:00 |
|
|
|
79679414d3
|
mobile fix
|
2023-07-27 11:35:20 +02:00 |
|
|
|
70930321ee
|
fun with js :-)
|
2023-07-27 11:25:11 +02:00 |
|
|
|
00aaa2dd86
|
remove debug
|
2023-07-26 13:11:17 +02:00 |
|
|
|
48eb1b7dc2
|
clean ui for logbook
|
2023-07-26 12:56:19 +02:00 |
|
|
|
97703403a8
|
clean code for boats ui
|
2023-07-26 12:24:22 +02:00 |
|
|
|
082fac9789
|
add stats
|
2023-07-24 20:56:46 +02:00 |
|
|
|
e90e27fc3d
|
improve faq
|
2023-07-24 14:00:34 +02:00 |
|
|
|
0e567ed02d
|
improve faq
|
2023-07-24 13:46:53 +02:00 |
|
|
|
346ca4d2c8
|
add faq
|
2023-07-24 13:43:13 +02:00 |
|
|
|
c42cd2cd9c
|
allow adding rowers to logbook
|
2023-07-24 13:01:39 +02:00 |
|
|
|
7c439b5b0a
|
fix typo
|
2023-07-23 20:09:47 +02:00 |
|
|
|
7ce3caece3
|
add faq
|
2023-07-23 20:00:47 +02:00 |
|
|
|
c32c8bb643
|
move always_show to tripdetails
|
2023-07-23 19:45:48 +02:00 |
|
|
|
61961b24e2
|
use autofocus
|
2023-07-23 18:16:26 +02:00 |
|
|
|
9fa70b1411
|
add functionality to finish logbook trips
|
2023-07-23 16:49:14 +02:00 |
|
|
|
1d4c5f356d
|
add first draft of logbook
|
2023-07-23 12:17:57 +02:00 |
|
|
|
f09454fb38
|
fix bug, forgot to use new data field
|
2023-07-22 18:24:48 +02:00 |
|
|
|
b2f626f906
|
allow creating all fields for new boats
|
2023-07-22 16:36:02 +02:00 |
|
|
|
0381465272
|
add db constraints; add optional name for login (to be sent to members)
|
2023-07-22 15:51:20 +02:00 |
|
|
|
524d1acee2
|
add full CRUD for boats
|
2023-07-22 15:34:42 +02:00 |
|
|
|
c0bb6d51de
|
create create/delete/view function for boats
|
2023-07-22 13:57:17 +02:00 |
|
|
|
115533e484
|
add faq
|
2023-07-18 09:32:32 +02:00 |
|
|
|
92a33ec731
|
friendlier faq
|
2023-07-11 15:11:01 +02:00 |
|
|
|
6d97c37fb0
|
be more verbose @ faq
|
2023-07-11 15:08:58 +02:00 |
|
|
|
c3870764dd
|
correct faq
|
2023-07-11 15:01:32 +02:00 |
|
|
|
49f254a9d5
|
fix ci
|
2023-06-28 14:32:35 +02:00 |
|
|
|
a17726e714
|
lower bound = 0 for unused seats
|
2023-06-28 14:15:03 +02:00 |
|
|
|
509412599f
|
change text
|
2023-06-26 09:34:52 +02:00 |
|
|
|
f05af311f2
|
add faq
|
2023-06-08 17:43:16 +02:00 |
|
Marie Birner
|
0e9d7857f8
|
[BUGFIX] styling special events list view
|
2023-06-08 15:42:00 +02:00 |
|
Marie Birner
|
16d00f2e11
|
[BUGFIX] styling special events list view
|
2023-06-08 15:38:49 +02:00 |
|
Marie Birner
|
46faccf959
|
[BUGFIX] styling special events list view
|
2023-06-08 15:37:05 +02:00 |
|
Marie Birner
|
6f2071df37
|
[BUGFIX] duplicate ids checkboxes in sidebar form
|
2023-06-08 15:28:08 +02:00 |
|
|
|
91fff843cb
|
Merge branch 'main' of gitlab.com:PhilippHofer/rot
|
2023-06-08 15:00:22 +02:00 |
|
|
|
d45c73cac9
|
show proper state of checkbox
|
2023-06-08 15:00:15 +02:00 |
|
Marie Birner
|
efb47ae52f
|
[TASK] change color header pinned event
|
2023-06-08 14:46:57 +02:00 |
|
Marie Birner
|
c17c86f7b7
|
[BUGFX] styling header date
|
2023-06-08 14:28:55 +02:00 |
|
|
|
47920305c4
|
allow updating pinning an planned_trip
|
2023-06-08 11:28:25 +02:00 |
|
Marie Birner
|
5d0bfddadf
|
[BUGFIX] sorting trips & events
|
2023-06-08 11:25:08 +02:00 |
|
|
|
87ed710f66
|
add is_pinned functionality
|
2023-06-08 10:57:42 +02:00 |
|
|
|
70e3d7524d
|
update deps; switch to hü :-)
|
2023-05-30 09:04:13 +02:00 |
|
|
|
d00aa35429
|
rephrase faq!
|
2023-05-14 09:33:15 +02:00 |
|
|
|
6a4ad409d7
|
order planned_events by time
|
2023-05-12 15:00:45 +02:00 |
|
|
|
968ab00cc0
|
show last access time
|
2023-05-10 09:04:09 +02:00 |
|
|
|
dab396640b
|
formulate more positively
|
2023-05-10 08:37:25 +02:00 |
|
|
|
b7aaea5fe8
|
allow trip_type specification for creating a trip
|
2023-05-05 09:28:29 +02:00 |
|
|
|
f9f9f49197
|
fix typo
|
2023-05-04 10:25:13 +02:00 |
|
|
|
9b4433ab09
|
fix typos
|
2023-05-03 23:17:05 +02:00 |
|
|
|
8effe700d0
|
Merge branch 'faq' into 'main'
Faq
See merge request PhilippHofer/rot!9
|
2023-05-03 20:59:24 +00:00 |
|
|
|
69ea13a365
|
show different faq depending on user type
|
2023-05-03 22:50:05 +02:00 |
|
Marie Birner
|
8d951b9a1b
|
[TASK] add macro for faq
|
2023-05-03 22:41:37 +02:00 |
|
|
|
9f7fa6b8c4
|
add edit option of planned_events
|
2023-05-03 22:40:22 +02:00 |
|
Marie Birner
|
db5f151b96
|
[TASK] add faqs for cox
|
2023-05-03 17:11:01 +02:00 |
|
|
|
787b28cc23
|
allow trip_type edit of trip
|
2023-05-03 16:51:37 +02:00 |
|
|
|
c9932b550b
|
add faq route
|
2023-05-03 16:31:27 +02:00 |
|
Marie Birner
|
1f29779ede
|
[TASK] layout trip_types and add onclick join msg javascript
|
2023-05-03 16:14:18 +02:00 |
|
Marie Birner
|
15644e8a0b
|
Merge commit 'e5088bddb0ab694abac5f6d2ab2d76a5042e52bb' into feature/frontend-triptype
# Conflicts:
# templates/index.html.tera
|
2023-05-03 15:26:41 +02:00 |
|
|
|
bb4dba7bc9
|
only allow guests to register for specific events; don't even show them the other trips
|
2023-04-29 18:57:01 +02:00 |
|
Philipp
|
a2a124d8c0
|
if clause forms add trip and add event
|
2023-04-28 22:12:13 +02:00 |
|
|
|
5421a3658d
|
Merge branch 'feature/cancelation' into 'main'
Feature/cancelation
See merge request PhilippHofer/rot!6
|
2023-04-28 19:50:48 +00:00 |
|
|
|
2730687d97
|
Merge branch 'feature/input-labels' into 'main'
show input labels in default case
See merge request PhilippHofer/rot!8
|
2023-04-28 19:47:00 +00:00 |
|
|
|
29234e08af
|
Update index.html.tera
|
2023-04-28 19:42:12 +00:00 |
|
Philipp
|
cb4d53c7f7
|
style delete button in admin view
|
2023-04-28 21:22:41 +02:00 |
|
|
|
0861d8b8d6
|
first draft of using trip types
|
2023-04-28 21:21:21 +02:00 |
|
Philipp
|
e51bd5882f
|
show input labels in default case
|
2023-04-28 21:06:14 +02:00 |
|
Philipp
|
d6b0ce1603
|
show cancelation in sidebar
|
2023-04-28 20:46:46 +02:00 |
|
Philipp
|
cecf15320d
|
show status of trip by adding icon and text
|
2023-04-28 20:22:46 +02:00 |
|
Philipp
|
cdebcefae8
|
show alert messages in admin view
|
2023-04-28 19:47:33 +02:00 |
|
Philipp
|
9baae98ecb
|
show alert messages in admin view
|
2023-04-28 19:44:32 +02:00 |
|
|
|
ce8ea22190
|
Merge branch 'delete-user' into 'main'
allow 'deletion' of user
See merge request PhilippHofer/rot!2
|
2023-04-28 17:39:09 +00:00 |
|
Philipp
|
071f88c9a7
|
change header message box sidebar
|
2023-04-28 19:35:21 +02:00 |
|
Philipp
|
9384c78f42
|
change header message box sidebar
|
2023-04-28 19:33:56 +02:00 |
|
|
|
055c330a3e
|
allow 'deletion' of user
|
2023-04-28 19:29:20 +02:00 |
|
Philipp
|
1e29fab4d1
|
fix divider visual bug between events and trips
|
2023-04-28 19:27:36 +02:00 |
|
Philipp
|
62617b4b42
|
show if_guest next to name change color
|
2023-04-28 19:16:15 +02:00 |
|
Philipp
|
ed684a0ff5
|
show if_guest next to name
|
2023-04-28 19:04:35 +02:00 |
|
Philipp
|
a8dbf6b025
|
add missing sidebar
|
2023-04-28 18:55:51 +02:00 |
|
Philipp
|
7950b23c49
|
TASK improve structure index file
|
2023-04-28 18:35:42 +02:00 |
|
|
|
d535d241e4
|
more clear about how many rowers should be added
|
2023-04-21 21:12:27 +02:00 |
|
|
|
55ca9a5c15
|
add optional min=0 field; add time for starting time
|
2023-04-18 21:41:16 +02:00 |
|
|
|
b50d546a5c
|
show how many people can join trip, even if no one is registered yet
|
2023-04-18 11:09:14 +02:00 |
|
|
|
57750620b0
|
add example of time format
|
2023-04-18 11:06:29 +02:00 |
|
|
|
30c7637693
|
make 'Steuern' gray if already enough cox enrolled
|
2023-04-17 19:37:21 +02:00 |
|
|
|
ac534cf690
|
make 'Steuern' gray if already enough cox enrolled
|
2023-04-17 19:34:22 +02:00 |
|
|
|
d9bb190301
|
be more precise with cox_needed
|
2023-04-17 19:21:19 +02:00 |
|
Marie Birner
|
1e9f3a74fb
|
[BUGFIX] favicon & title tag head
|
2023-04-13 21:27:05 +02:00 |
|
Marie Birner
|
5a40f8ebd6
|
[BUGFIX] layout shift after filterung
|
2023-04-10 23:10:24 +02:00 |
|
Marie Birner
|
25a27b492c
|
[WIP] filter btns session storage
|
2023-04-10 22:42:00 +02:00 |
|
Marie Birner
|
504192e5f2
|
[TASK] improve functionality cox_needed filter
|
2023-04-10 15:00:25 +02:00 |
|
