1
0
mirror of https://gitlab.crans.org/bde/nk20 synced 2024-11-26 18:37:12 +00:00
Commit Graph

29 Commits

Author SHA1 Message Date
Yohann D'ANELLO
ae629b55ad Add HTML titles 2020-07-30 17:30:21 +02:00
Yohann D'ANELLO
84e8b02594 🐛 Calculating permissions faster 2020-07-28 15:25:08 +02:00
Yohann D'ANELLO
f567b1a343 Activity list is displayed in the right order 2020-05-29 21:37:44 +02:00
ynerant
395c52220f Merge branch 'master' into 'tranfer_front'
# Conflicts:
#   apps/activity/views.py
#   apps/permission/backends.py
#   locale/de/LC_MESSAGES/django.po
#   locale/fr/LC_MESSAGES/django.po
#   static/js/base.js
#   templates/base.html
#   templates/member/user_list.html
2020-05-07 18:48:35 +02:00
Yohann D'ANELLO
154ea64b9f Launching WEI app, add models 2020-04-11 03:37:06 +02:00
Yohann D'ANELLO
751147f254 Don't display a note that we can't see, fix CI, fix distinct fields on PostgresSQL DB 2020-04-10 00:02:22 +02:00
Pierre-antoine Comby
161d2ceed7 Merge branch 'explicit>implicit' into 'master'
Explicit>implicit

See merge request bde/nk20!75
2020-04-09 22:41:04 +02:00
Pierre-antoine Comby
99d3ba9c1a Merge branch 'master' into 'explicit>implicit'
# Conflicts:
#   apps/activity/views.py
2020-04-09 22:31:54 +02:00
Pierre-antoine Comby
68808ddece Merge branch 'master' into 'fix_distinct'
# Conflicts:
#   apps/activity/views.py
2020-04-09 22:30:19 +02:00
Pierre-antoine Comby
61b32f9aec explicit context is better than implicit ctx 2020-04-06 12:13:12 +02:00
Pierre-antoine Comby
9fbfac7bdb distinct on field not supported by sqlite 2020-04-06 11:44:02 +02:00
Yohann D'ANELLO
9d584ae87a Add shortcuts for transfers and credits in the activity entry page 2020-04-06 07:06:52 +02:00
Yohann D'ANELLO
6498a20b87 A user is active iff the email and the account are validated 2020-04-06 03:58:48 +02:00
Yohann D'ANELLO
1aae18e6a6 Improved permissions, 404 and 403 errors will be more frequent (when we type an invalid URL) 2020-03-31 04:16:30 +02:00
Yohann D'ANELLO
fcb4da2db3 Guests can't be invited since the activity is started 2020-03-30 17:27:02 +02:00
Yohann D'ANELLO
fb5796d35e Guests can't be invited more than 5 times a year and a member can't invite more than 3 people per activity. 2020-03-30 00:42:32 +02:00
Yohann D'ANELLO
691a03ecad Add some initial permissions for activities 2020-03-28 19:05:21 +01:00
Yohann D'ANELLO
c8b72cf1ff Guests can pay with CB or coins, lot of other improvements 2020-03-28 16:52:58 +01:00
Yohann D'ANELLO
81cfaf12fa People can join activities 2020-03-28 13:38:31 +01:00
Yohann D'ANELLO
a8422411bc Entry page (we can search people) 2020-03-28 01:45:13 +01:00
Yohann D'ANELLO
d6e202a26f Display guests list 2020-03-27 21:18:27 +01:00
Yohann D'ANELLO
0d43d74c60 Display activity details 2020-03-27 19:47:43 +01:00
Yohann D'ANELLO
34949f0859 Fix activity in Guest model 2020-03-27 19:16:38 +01:00
Yohann D'ANELLO
ceb5690838 Invite people 2020-03-27 18:02:22 +01:00
Yohann D'ANELLO
f09364d3d8 Custom auto-complete fields, remove DAL requirement 2020-03-27 16:19:33 +01:00
Yohann D'ANELLO
f81e2b5b5b Use custom inputs for date picker and amounts 2020-03-27 13:50:02 +01:00
Yohann D'ANELLO
45b14ed1bd Create activities 2020-03-27 01:31:54 +01:00
Yohann D'ANELLO
213e5a8369 Fix CI 2020-03-27 00:40:35 +01:00
Pierre-antoine Comby
d5f718fbba start activity view and urls 2020-03-01 17:55:48 +01:00