Pierre-antoine Comby
|
9fbfac7bdb
|
distinct on field not supported by sqlite
|
2020-04-06 11:44:02 +02:00 |
ynerant
|
72e5df0cf5
|
Merge branch 'new-note-type' into 'master'
Memberships
Closes #43 and #16
See merge request bde/nk20!71
|
2020-04-05 02:06:19 +02:00 |
ynerant
|
f95290e323
|
Merge branch 'fix-setup' into 'master'
L'installation depuis Docker était cassée
See merge request bde/nk20!72
|
2020-04-03 04:06:35 +02:00 |
Yohann D'ANELLO
|
04f9ae51ed
|
Fix docker setup, remove select2 files (unused)
|
2020-04-03 04:03:58 +02:00 |
Yohann D'ANELLO
|
0cdc8ae004
|
RolePermissions were missing in the API
|
2020-04-02 16:06:58 +02:00 |
Yohann D'ANELLO
|
17ea2246ca
|
Remove useless field in activities
|
2020-04-02 15:43:41 +02:00 |
Yohann D'ANELLO
|
be42801709
|
The memoization doesn't work when objects don't have a primary key.
|
2020-04-02 14:50:28 +02:00 |
Yohann D'ANELLO
|
8ad464ae0c
|
Fix CI
|
2020-04-02 00:42:00 +02:00 |
Yohann D'ANELLO
|
5c9c0bbc2a
|
Optimize permissions, use memoization
|
2020-04-02 00:30:22 +02:00 |
Yohann D'ANELLO
|
3f5faa0b05
|
Add tab for user list
|
2020-04-01 20:56:24 +02:00 |
Yohann D'ANELLO
|
5eb08fd822
|
Dynamic user research
|
2020-04-01 20:14:16 +02:00 |
Yohann D'ANELLO
|
2853fe252b
|
Renew memberships
|
2020-04-01 18:47:56 +02:00 |
Yohann D'ANELLO
|
356c8588e7
|
Users that are not member of the club Kfet can't have a negative balance
|
2020-04-01 17:00:06 +02:00 |
Yohann D'ANELLO
|
92ab5ee3af
|
Fix memberships with clubs without memberships (we always need treasurers...)
|
2020-04-01 04:34:42 +02:00 |
Yohann D'ANELLO
|
535c493bc7
|
Fix some issues
|
2020-04-01 04:20:47 +02:00 |
Yohann D'ANELLO
|
0df0f3f66b
|
Membership fees for paid and unpaid students, closes #43
|
2020-04-01 04:07:55 +02:00 |
Yohann D'ANELLO
|
d5b010980b
|
Full membership support
|
2020-04-01 03:42:19 +02:00 |
Yohann D'ANELLO
|
bf9789bd9e
|
Restructurate memberships, closes #16
|
2020-03-31 23:54:14 +02:00 |
Yohann D'ANELLO
|
e98693b214
|
Memberships are optional for clubs
|
2020-03-31 16:22:11 +02:00 |
Yohann D'ANELLO
|
dd3b7bd7e5
|
Remove note activities
|
2020-03-31 14:57:44 +02:00 |
Yohann D'ANELLO
|
12945945bc
|
Update translations
|
2020-03-31 14:10:30 +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
|
c384ee02eb
|
Implement a new type of note (see #45)
|
2020-03-31 01:03:30 +02:00 |
ynerant
|
c8854cf45d
|
Merge branch 'activity' into 'master'
Activity management
See merge request bde/nk20!32
|
2020-03-30 22:43:12 +02:00 |
Yohann D'ANELLO
|
b0b3aa35a9
|
Guests can't be invited if the activity is not validated
|
2020-03-30 17:35:47 +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
|
a805e41367
|
Fix CI
|
2020-03-28 02:09:10 +01:00 |
Yohann D'ANELLO
|
08ed694438
|
Update translations
|
2020-03-28 02:08:29 +01:00 |
Yohann D'ANELLO
|
a8422411bc
|
Entry page (we can search people)
|
2020-03-28 01:45:13 +01:00 |
Yohann D'ANELLO
|
8c1d902c30
|
Open and validate activities
|
2020-03-27 22:48:20 +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
|
4f4bbf6d0e
|
Fix server starting
|
2020-03-27 16:32:46 +01:00 |
Yohann D'ANELLO
|
f09364d3d8
|
Custom auto-complete fields, remove DAL requirement
|
2020-03-27 16:19:33 +01:00 |
Yohann D'ANELLO
|
823bcfe781
|
Fix CI
|
2020-03-27 14:19:55 +01:00 |
Yohann D'ANELLO
|
dadd840645
|
Merge remote-tracking branch 'origin/master' into activity
|
2020-03-27 14:16:10 +01:00 |
Pierre-antoine Comby
|
8b4c39269c
|
Merge branch 'front_club' into 'master'
Finitions sur l'interface club
See merge request bde/nk20!70
|
2020-03-27 14:11:28 +01:00 |
Pierre-antoine Comby
|
09fb0e1470
|
Merge branch 'master' into front_club
|
2020-03-27 14:07:22 +01:00 |
Pierre-antoine Comby
|
ee3d441a56
|
add parent club link
|
2020-03-27 14:04:30 +01:00 |
Pierre-antoine Comby
|
ed746f39b2
|
Merge branch 'devalidation_reason' into 'master'
Motif de dévalidation
See merge request bde/nk20!67
|
2020-03-27 13:56:39 +01:00 |
ynerant
|
bef4958759
|
Merge branch 'master' into 'devalidation_reason'
# Conflicts:
# locale/de/LC_MESSAGES/django.po
# locale/fr/LC_MESSAGES/django.po
|
2020-03-27 13:52:48 +01:00 |
Yohann D'ANELLO
|
f81e2b5b5b
|
Use custom inputs for date picker and amounts
|
2020-03-27 13:50:02 +01:00 |
Pierre-antoine Comby
|
e27b456aea
|
Merge branch 'parent-club' into 'master'
Resolve "Club Parent"
Closes #42
See merge request bde/nk20!65
|
2020-03-27 13:29:43 +01:00 |
Pierre-antoine Comby
|
a3a8fd601c
|
revert to ReadProtectedViewset
|
2020-03-27 13:26:47 +01:00 |