 philipp
|
3ae07b3815
|
Merge branch 'main' of gitlab.com:PhilippHofer/rot
|
2023-05-03 23:01:28 +02:00 |
|
|
philipp
|
db674573ea
|
fix unused import
|
2023-05-03 23:01:19 +02:00 |
|
 Marie Birner
|
cb17bdcfaa
|
[BUGFIX] safari sidebar-header issue
|
2023-05-03 23:00:55 +02:00 |
|
|
philipp
|
8effe700d0
|
Merge branch 'faq' into 'main'
Faq
See merge request PhilippHofer/rot!9
|
2023-05-03 20:59:24 +00:00 |
|
|
philipp
|
c89a199a33
|
use proper field
|
2023-05-03 22:54:10 +02:00 |
|
|
philipp
|
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 |
|
|
philipp
|
9f7fa6b8c4
|
add edit option of planned_events
|
2023-05-03 22:40:22 +02:00 |
|
|
philipp
|
822680929a
|
add todo
|
2023-05-03 17:18:02 +02:00 |
|
|
Marie Birner
|
db5f151b96
|
[TASK] add faqs for cox
|
2023-05-03 17:11:01 +02:00 |
|
|
philipp
|
2fd5b65994
|
fix tests and add new one
|
2023-05-03 16:53:36 +02:00 |
|
|
philipp
|
787b28cc23
|
allow trip_type edit of trip
|
2023-05-03 16:51:37 +02:00 |
|
|
philipp
|
172901b80f
|
add trip_types
|
2023-05-03 16:38:15 +02:00 |
|
|
philipp
|
468382755a
|
add todo
|
2023-05-03 16:35:05 +02:00 |
|
|
philipp
|
c9932b550b
|
add faq route
|
2023-05-03 16:31:27 +02:00 |
|
|
philipp
|
b2862292cd
|
Merge branch 'feature/frontend-triptype' into 'main'
first draft of using trip types
See merge request PhilippHofer/rot!5
|
2023-05-03 14:30:23 +00:00 |
|
|
philipp
|
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 |
|
|
philipp
|
3f01bf39b3
|
deduplicate code
|
2023-05-03 16:06:27 +02:00 |
|
|
philipp
|
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 |
|
|
philipp
|
e5088bddb0
|
Push
|
2023-05-03 14:39:53 +02:00 |
|
|
philipp
|
913d0ac78e
|
push
|
2023-05-03 13:32:23 +02:00 |
|
|
philipp
|
7981751f18
|
remove todo
|
2023-05-02 23:35:31 +02:00 |
|
|
philipp
|
2187e4a99b
|
update deps
|
2023-05-01 12:58:13 +02:00 |
|
|
philipp
|
9f265281cc
|
remove test db
|
2023-04-29 19:18:57 +02:00 |
|
|
philipp
|
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 |
|
|
philipp
|
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
|
5b06eaeebc
|
structure todos
|
2023-04-29 10:27:23 +02:00 |
|
|
philipp
|
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 |
|
|
philipp
|
ee0a275b9b
|
add todo
|
2023-04-28 21:59:32 +02:00 |
|
|
philipp
|
f9ccef3817
|
update deps
|
2023-04-28 21:52:06 +02:00 |
|
|
philipp
|
5421a3658d
|
Merge branch 'feature/cancelation' into 'main'
Feature/cancelation
See merge request PhilippHofer/rot!6
|
2023-04-28 19:50:48 +00:00 |
|
|
philipp
|
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 |
|
|
philipp
|
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 |
|
|
philipp
|
29234e08af
|
Update index.html.tera
|
2023-04-28 19:42:12 +00:00 |
|
|
philipp
|
af7b5dce7d
|
Merge branch 'feature/triptypebackend' into 'main'
Feature/triptypebackend
See merge request PhilippHofer/rot!4
|
2023-04-28 19:38:34 +00:00 |
|
|
philipp
|
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 |
|
|
philipp
|
0861d8b8d6
|
first draft of using trip types
|
2023-04-28 21:21:21 +02:00 |
|
|
philipp
|
3d5ad30904
|
send triptype to frontend
|
2023-04-28 21:19:51 +02:00 |
|
|
philipp
|
bd5a28b342
|
send triptype to frontend
|
2023-04-28 21:19:30 +02:00 |
|
|
philipp
|
34e2b697ea
|
add seeds
|
2023-04-28 21:19:01 +02:00 |
|
|
philipp
|
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 |
|