Commit Graph

1595 Commits

Author SHA1 Message Date
968ab00cc0 show last access time 2023-05-10 09:04:09 +02:00
8c38a2faf6 add last_access column for user table 2023-05-10 08:57:20 +02:00
dab396640b formulate more positively 2023-05-10 08:37:25 +02:00
6449d27a85 update packages 2023-05-08 09:14:33 +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
efc9310399 Merge branch 'main' of gitlab.com:PhilippHofer/rot 2023-05-03 23:17:12 +02:00
9b4433ab09 fix typos 2023-05-03 23:17:05 +02:00
Marie Birner
1a968bd168 Merge commit '3ae07b381578420afec86f3d3384cf32a419c787' 2023-05-03 23:14:08 +02:00
Marie Birner
1fc1a9fa24 [BUGFIX] safari sidebar-header issue 2023-05-03 23:13:40 +02:00
3ae07b3815 Merge branch 'main' of gitlab.com:PhilippHofer/rot 2023-05-03 23:01:28 +02:00
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
8effe700d0 Merge branch 'faq' into 'main'
Faq

See merge request PhilippHofer/rot!9
2023-05-03 20:59:24 +00:00
c89a199a33 use proper field 2023-05-03 22:54:10 +02: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
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
2fd5b65994 fix tests and add new one 2023-05-03 16:53:36 +02:00
787b28cc23 allow trip_type edit of trip 2023-05-03 16:51:37 +02:00
172901b80f add trip_types 2023-05-03 16:38:15 +02:00
468382755a add todo 2023-05-03 16:35:05 +02:00
c9932b550b add faq route 2023-05-03 16:31:27 +02:00
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
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