ynerant/nk20
1
0
Fork 0
mirror of https://gitlab.crans.org/bde/nk20 synced 2024-12-27 18:02:23 +00:00
Code Issues Releases Wiki Activity
675 Commits 21 Branches 4 Tags 27 MiB
751147f254
Commit Graph

399 Commits

Author SHA1 Message Date
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
Yohann D'ANELLO
bac81cd13e Merge branch 'master' into tranfer_front 
# Conflicts:
#	static/js/base.js
 2020-04-09 22:49:52 +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
Yohann D'ANELLO
fc511689b0 Update mail translation 2020-04-09 22:03:26 +02:00
Yohann D'ANELLO
e067b19d41 Paginate memberships and transactions 2020-04-06 19:51:39 +02:00
Pierre-antoine Comby
7e0aac0125 add docstring for entry 2020-04-06 12:32:44 +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
6fedbe2a2a Some model translations were missing 2020-04-06 10:58:16 +02:00
Yohann D'ANELLO
bd41560f45 Update permission fixtures 2020-04-06 10:45:32 +02:00
Yohann D'ANELLO
f833f1c46c Comment code 2020-04-06 08:58:39 +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
2c3127c746 Société générale can pay BDE membership renewal (only once) 2020-04-05 22:35:56 +02:00
Yohann D'ANELLO
c513759515 Credit note for membership renewals 2020-04-05 21:56:56 +02:00
Yohann D'ANELLO
515edc4459 Credit note for new memberships 2020-04-05 18:37:04 +02:00
Yohann D'ANELLO
5b61db8821 We adhere other users, not ourself... 2020-04-05 16:18:56 +02:00
Yohann D'ANELLO
e8133805f5 Users must be member of the BDE club 2020-04-05 16:07:31 +02:00
Yohann D'ANELLO
f2baeedc01 Add basic roles for BDE and Kfet 2020-04-05 16:05:49 +02:00
Yohann D'ANELLO
ff820ef086 Update translations 2020-04-05 15:42:09 +02:00
Yohann D'ANELLO
f286f99ced Handle payments from the Société Générale, closes #15 2020-04-05 15:31:39 +02:00
Yohann D'ANELLO
3516b1fa04 Add links to resend mail confirmations 2020-04-05 09:48:23 +02:00
Yohann D'ANELLO
fbc25240e6 Validate registrations, closes #14, #18, #19 2020-04-05 09:09:21 +02:00
Yohann D'ANELLO
b1cd46bf7d Invalidate registrations, fix profile creation 2020-04-05 08:01:51 +02:00
Yohann D'ANELLO
f10497bac3 List pending users 2020-04-05 06:40:03 +02:00
Yohann D'ANELLO
49807d33d9 Use a separate app for registration 2020-04-05 05:17:28 +02:00
Yohann D'ANELLO
0f77b9df9a Unvalidate e-mail when the user changes it, but the user still active 2020-04-05 04:37:29 +02:00
Yohann D'ANELLO
26281af673 Send an e-mail verification to a new registered user 2020-04-05 04:26:42 +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
Yohann D'ANELLO
b0b3aa35a9 Guests can't be invited if the activity is not validated 2020-03-30 17:35:47 +02:00