|
|
6fa43053ba
|
Merge branch 'main' into feature/frontend-triptype
|
2023-05-03 16:22:05 +02:00 |
|
Marie Birner
|
1f29779ede
|
[TASK] layout trip_types and add onclick join msg javascript
|
2023-05-03 16:14:18 +02:00 |
|
|
|
3f01bf39b3
|
deduplicate code
|
2023-05-03 16:06:27 +02:00 |
|
|
|
0b34b776ac
|
remove unwrap :-)
|
2023-05-03 15:59:28 +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 |
|
|
|
e5088bddb0
|
Push
|
2023-05-03 14:39:53 +02:00 |
|
|
|
913d0ac78e
|
push
|
2023-05-03 13:32:23 +02:00 |
|
|
|
7981751f18
|
remove todo
|
2023-05-02 23:35:31 +02:00 |
|
|
|
2187e4a99b
|
update deps
|
2023-05-01 12:58:13 +02:00 |
|
|
|
9f265281cc
|
remove test db
|
2023-04-29 19:18:57 +02:00 |
|
|
|
297fa86fbc
|
remove column
|
2023-04-29 19:09:56 +02:00 |
|
Philipp
|
d741b6c9ab
|
Merge branch 'main' of gitlab.com:PhilippHofer/rot
|
2023-04-29 19:09:19 +02:00 |
|
Philipp
|
5c08dc8a7f
|
push db
|
2023-04-29 19:08:17 +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 |
|
|
|
5b06eaeebc
|
structure todos
|
2023-04-29 10:27:23 +02:00 |
|
|
|
c7b4a0bf9c
|
structure todos
|
2023-04-29 10:26:16 +02:00 |
|
Philipp
|
59249003bd
|
add to readme
|
2023-04-28 22:17:25 +02:00 |
|
Philipp
|
a2a124d8c0
|
if clause forms add trip and add event
|
2023-04-28 22:12:13 +02:00 |
|
|
|
ee0a275b9b
|
add todo
|
2023-04-28 21:59:32 +02:00 |
|
|
|
f9ccef3817
|
update deps
|
2023-04-28 21:52:06 +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 |
|
|
|
f2d8e872e2
|
Merge branch 'feature/delete-user-btn' into 'main'
style delete button in admin view
See merge request PhilippHofer/rot!7
|
2023-04-28 19:45:28 +00:00 |
|
|
|
29234e08af
|
Update index.html.tera
|
2023-04-28 19:42:12 +00:00 |
|
|
|
af7b5dce7d
|
Merge branch 'feature/triptypebackend' into 'main'
Feature/triptypebackend
See merge request PhilippHofer/rot!4
|
2023-04-28 19:38:34 +00:00 |
|
|
|
22e8511212
|
reorder migratoin
|
2023-04-28 21:30:13 +02: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 |
|
|
|
3d5ad30904
|
send triptype to frontend
|
2023-04-28 21:19:51 +02:00 |
|
|
|
bd5a28b342
|
send triptype to frontend
|
2023-04-28 21:19:30 +02:00 |
|
|
|
34e2b697ea
|
add seeds
|
2023-04-28 21:19:01 +02:00 |
|
|
|
ea72b06c18
|
add migration
|
2023-04-28 21:18:50 +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 |
|
|
|
253018580a
|
send flash msg to /admin view
|
2023-04-28 19:59:07 +02:00 |
|
|
|
a2ca837a21
|
Merge branch 'delete-user' into 'main'
fix bug
See merge request PhilippHofer/rot!3
|
2023-04-28 17:53:00 +00: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 |
|
|
|
734bbd434e
|
fix bug
|
2023-04-28 19:43:59 +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 |
|
|
|
c5741e8139
|
Merge branch 'main' of gitlab.com:PhilippHofer/rot
|
2023-04-28 19:08:21 +02:00 |
|
|
|
0ff64c5c9e
|
finish tests
|
2023-04-28 19:08:17 +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 |
|
