ynerant/nk20
1
0
Fork 0
mirror of https://gitlab.crans.org/bde/nk20 synced 2024-11-26 18:37:12 +00:00
Code Issues Releases Wiki Activity
1,590 Commits 20 Branches 4 Tags 27 MiB
08ba0b263a
Commit Graph

325 Commits

Author SHA1 Message Date
Yohann D'ANELLO
c50fdd6689 Move the mailing list registration to the Profile model, see #50 2020-08-13 19:43:37 +02:00
Yohann D'ANELLO
721da093e9 Don't update membership information every time 2020-08-13 18:16:26 +02:00
Yohann D'ANELLO
c466715e8a Raise permission denied on CreateView if you don't have the permission to create a sample instance, see #53 2020-08-13 15:20:15 +02:00
Yohann D'ANELLO
999cc0a6b2 Tesdt login page 2020-08-10 19:36:04 +02:00
Alexandre Iooss
747a878cca Do not hover table when not clickable 2020-08-10 18:01:39 +02:00
Yohann D'ANELLO
c612e159cf See user information does not imply see the note balance 2020-08-10 16:32:45 +02:00
Alexandre Iooss
bba69f0a60 Give Pikachu as an example 2020-08-10 12:09:05 +02:00
Alexandre Iooss
beff848796 Use a fixed-width container by default for lisibility 2020-08-10 12:08:47 +02:00
Alexandre Iooss
7b40ee1ca4 Reorder templates 2020-08-09 19:06:57 +02:00
Yohann D'ANELLO
764eaafb95 Emails are unique. Translate mail foooters. Closes #55 #56 2020-08-09 16:38:37 +02:00
Yohann D'ANELLO
5f87e76be8 Fix Profile model in Django Admin 2020-08-09 13:42:37 +02:00
Pierre-antoine Comby
18eaf4477e 🐛 timezone.now is a DateTime, not a Date 2020-08-08 15:30:33 +02:00
Yohann D'ANELLO
ad59b5c81e Change help text in membership fields in club form 2020-08-07 14:20:34 +02:00
Yohann D'ANELLO
979628b02d 🐛 default last_report date is today, not the migration date 2020-08-06 20:30:17 +02:00
Yohann D'ANELLO
fd2f426f55 🐛 Fix signup 2020-08-06 19:56:37 +02:00
Yohann D'ANELLO
d95cd8c7c7 🎨 Better autocomplete field 2020-08-06 18:27:57 +02:00
Yohann D'ANELLO
dd4b24d999 Don't match users only with the start of the name 2020-08-06 15:21:16 +02:00
Yohann D'ANELLO
de5e0c958e Fix some activity errors 2020-08-06 14:11:55 +02:00
Yohann D'ANELLO
cba6a35b6c Display matched alias in user table 2020-08-06 13:07:22 +02:00
Yohann D'ANELLO
0de69cbfaf 💚 Fix linters 2020-08-06 12:50:24 +02:00
Yohann D'ANELLO
33806967c8 Prepare weekly reports 2020-08-05 23:19:17 +02:00
Yohann D'ANELLO
acf7ecc4ae Use phone number validator 2020-08-05 14:14:51 +02:00
Yohann D'ANELLO
6c9cf73848 Update permissions to see our own note 2020-08-05 12:22:35 +02:00
Yohann D'ANELLO
a096dc4427 ✨ Adhere to parent clubs automatically, adhere to Kfet automatically when registering to the WEI 2020-08-04 20:04:41 +02:00
Yohann D'ANELLO
20ce817b16 🐛 WEI members must be members of the Kfet club *this year* 2020-08-03 23:55:01 +02:00
Yohann D'ANELLO
0a2c9d9c87 🐛 Better entry page 2020-08-03 15:44:06 +02:00
Yohann D'ANELLO
fbf3a0bcf6 🐛 A new user can't take an existing alias as username 2020-08-03 12:35:51 +02:00
Yohann D'ANELLO
2f018f8c9d Always query distinct objects 2020-08-02 08:57:16 +02:00
Yohann D'ANELLO
37dc535d6d Display only one user 2020-08-01 23:05:14 +02:00
Yohann D'ANELLO
c0cdb13130 Can't concatenate string and proxy 2020-08-01 22:30:34 +02:00
Yohann D'ANELLO
efc2b6b0b0 Send mail to users when the note balance is negative 2020-08-01 21:44:16 +02:00
ynerant
e50bff8e14 Merge branch 'beta-soon' into 'master' 
Pre-beta fixes

Closes #51

See merge request bde/nk20!86
 2020-08-01 16:12:09 +02:00
Yohann D'ANELLO
b5586c647b 💚 Fix linters 2020-08-01 16:07:47 +02:00
Yohann D'ANELLO
b6453ce03d 💄 Improve Django Admin 2020-08-01 15:13:29 +02:00
Yohann D'ANELLO
23b775447c 🐛 Fix email validation link 2020-08-01 10:48:17 +02:00
Yohann D'ANELLO
fd705adb05 Filter members 2020-07-31 17:01:52 +02:00
Yohann D'ANELLO
bd35e4e21e Separate club members in a dedicated page (WIP) 2020-07-31 13:17:16 +02:00
Yohann D'ANELLO
72dcc93136 Club managers can register new members to a club, even if they don't have the right to create a transaction 2020-07-31 09:49:43 +02:00
Yohann D'ANELLO
cb38ceb2c6 New club members have only the role "Club member" by default and no other one 2020-07-31 09:41:22 +02:00
Yohann D'ANELLO
ae629b55ad Add HTML titles 2020-07-30 17:30:21 +02:00
Yohann D'ANELLO
aa66361ac7 Update permissions to create clubs. 
For now, only superusers can edit the roles of a user.
 2020-07-30 16:36:44 +02:00
Yohann D'ANELLO
e9cbc8e623 Fix linters 2020-07-30 15:53:23 +02:00
Yohann D'ANELLO
fb775de923 Add backdoor to login as other users (in debug mode only) 2020-07-30 12:50:48 +02:00
Yohann D'ANELLO
224ef5b2f0 Allow users to have complicated username 2020-07-29 19:37:40 +02:00
Yohann D'ANELLO
b8a88eeda4 Only staff with good permission mask can visit Django Admin 2020-07-29 11:38:59 +02:00
Yohann D'ANELLO
f597b6dbd8 Prevent creating club when there exists an alias that is similar to the name of the club 2020-07-28 23:16:38 +02:00
Yohann D'ANELLO
12ebf9d12a Before checking membership roles, we wait before the creation of the membership 2020-07-28 19:38:25 +02:00
Yohann D'ANELLO
84e8b02594 🐛 Calculating permissions faster 2020-07-28 15:25:08 +02:00
Yohann D'ANELLO
55bc288deb Some roles can only be given in some clubs 2020-07-25 19:59:04 +02:00
Yohann D'ANELLO
fb5e2578af Merge Role and RolePermissions 2020-07-25 19:40:30 +02:00
Yohann D'ANELLO
f0bca69825 🐛 Minor fixes 2020-07-25 18:18:53 +02:00
Yohann D'ANELLO
2eb601bd66 💥 Improve performances 2020-07-25 17:25:57 +02:00
ynerant
1735ba25a8 Merge branch 'beta-soon' into 'master' 
Beta soon

See merge request bde/nk20!85
 2020-07-21 22:47:50 +02:00
Yohann D'ANELLO
ac5041f3ec Better club search bar 2020-06-21 22:27:32 +02:00
Pierre-antoine Comby
f2ac0cd8cf order table of club for Pollion 2020-06-02 09:37:25 +02:00
Yohann D'ANELLO
8c0ccdfdd0 Don't change the password of another member (+ minor fixes on WEI app) 2020-04-27 20:25:02 +02:00
Yohann D'ANELLO
eb39aff1ab Fix email validation, turbolinks link 2020-04-27 17:59:34 +02:00
Yohann D'ANELLO
b81f186866 Add PDF member lists 2020-04-23 18:28:16 +02:00
Yohann D'ANELLO
46464f535c Update translations 2020-04-22 17:30:17 +02:00
Yohann D'ANELLO
c31fb0c13d Add department and promotion in Profile model 2020-04-22 16:25:09 +02:00
Yohann D'ANELLO
b23814aef0 Handle credits from the Société générale 2020-04-22 03:26:45 +02:00
Yohann D'ANELLO
080510bcf2 Add WEI form on signup form 2020-04-16 23:31:36 +02:00
Yohann D'ANELLO
db67598b25 Validate WEI memberships 2020-04-14 04:46:52 +02:00
Yohann D'ANELLO
36b26e0baa Validation form (only front) 2020-04-14 03:41:26 +02:00
Yohann D'ANELLO
a186ccbb26 Update WEI models 2020-04-11 17:42:08 +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
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
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
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
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
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
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
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
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
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
09fb0e1470 Merge branch 'master' into front_club 2020-03-27 14:07:22 +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
Yohann D'ANELLO
213e5a8369 Fix CI 2020-03-27 00:40:35 +01:00
Pierre-antoine Comby
d9cdb01350 remove alias handling backend, gonna use DRF 2020-03-26 17:44:01 +01:00
Benjamin Graillot
59cd166b79 [member] tabs --> spaces 2020-03-25 18:05:46 +01:00
Pierre-antoine Comby
33e3657120 add aliases view to clubs 2020-03-25 18:00:40 +01:00
Benjamin Graillot
c86ddf17ad [member] Check membership of parent club 2020-03-25 17:54:28 +01:00
Pierre-antoine Comby
a41e51e23a add member get side information 2020-03-25 17:42:54 +01:00
Pierre-antoine Comby
26d70c4ef9 page title and edit buttons 2020-03-25 17:25:44 +01:00
Pierre-antoine Comby
826573f553 whitespaces compliance 2020-03-25 16:58:15 +01:00
Pierre-antoine Comby
2d18cb983f fee in cents for fixture and initial picture 2020-03-25 16:12:57 +01:00
Pierre-antoine Comby
ff17f1e877 Club view should as good as profile ones 2020-03-25 16:11:44 +01:00
Benjamin Graillot
a4cb19e5b1 [member] Added parent_club field to Club 2020-03-23 09:07:39 +01:00
Yohann D'ANELLO
d494a3e7fa Quality assurance 2020-03-20 18:13:34 +01:00
Yohann D'ANELLO
091c427707 Restructurate code 2020-03-20 14:43:35 +01:00
Yohann D'ANELLO
3f2b21f7f4 Fix CI 2020-03-20 02:14:43 +01:00
Yohann D'ANELLO
6fc43e651e More optimisation 2020-03-20 01:46:59 +01:00
Yohann D'ANELLO
f80cb635d3 Optimize permissions, full support add perms, more fixtures 2020-03-20 00:06:28 +01:00
Yohann D'ANELLO
7794210cc8 Being superuser is not enough (must have the correct mask), add some initial fixtures 2020-03-19 18:53:06 +01:00
Yohann D'ANELLO
95315cdbe2 Implements permission masks 2020-03-19 16:12:52 +01:00
Yohann D'ANELLO
730d37c620 Protect views from viewing if the user has no right to view an object 2020-03-19 02:26:06 +01:00
Yohann D'ANELLO
057f42fdb6 Handle permissions (and it seems working!) 2020-03-18 14:42:35 +01:00
Yohann D'ANELLO
112d4b6c5a Merge branch 'consos' into rights 
# Conflicts:
#	apps/logs/signals.py
#	note_kfet/settings/base.py
 2020-03-17 21:11:14 +01:00
Yohann D'ANELLO
a1f37f0eea Validation/devalidation of a transaction on profile page 2020-03-17 17:48:55 +01:00
Yohann D'ANELLO
2bd59544ec Remove two whitespaces for tox 2020-03-11 17:10:16 +01:00
ynerant
46e472ed6d Merge branch 'master' into 'fix-what-i-broke' 
# Conflicts:
#   templates/base.html
 2020-03-11 17:03:44 +01:00
Benjamin Graillot
b17ff59984 Added indexes for Membership 2020-03-11 13:51:26 +01:00
Benjamin Graillot
c8f5451ea4 Added indexes for Transaction, Alias and Profile 2020-03-11 13:46:47 +01:00
Yohann D'ANELLO
417cd5da04 Improve REST API with filters 2020-03-11 11:15:03 +01:00
Yohann D'ANELLO
aa731d1ae4 Regexp must begin with ^ 2020-03-10 17:16:03 +01:00
Pierre-antoine Comby
0de2c18bec profile is first created via signal. 2020-03-09 18:08:37 +01:00
Yohann D'ANELLO
d0206fb790 Make erdnaxe be happy 2020-03-07 22:28:59 +01:00
Pierre-antoine Comby
663ee072d4 always save to png 2020-03-07 17:58:41 +01:00
Yohann D'ANELLO
30ce17b644 Update a lot of things 2020-03-07 13:12:17 +01:00
Yohann D'ANELLO
a014a97e14 Merge remote-tracking branch 'origin/rights' into rights 2020-03-07 11:21:08 +01:00
Benjamin Graillot
9d61e217e9 [permission] Only split permission up to 3 2020-03-07 11:21:19 +01:00
Yohann D'ANELLO
0884270474 Merge branch 'master' into rights 
# Conflicts:
#	note_kfet/settings/base.py
 2020-03-07 10:42:51 +01:00
ynerant
6f7374710b Merge branch 'master' into 'logging' 
# Conflicts:
#   locale/de/LC_MESSAGES/django.po
#   locale/fr/LC_MESSAGES/django.po
 2020-03-07 10:32:17 +01:00
Pierre-antoine Comby
38feb693f3 crop,resized, and save picture at the right place 2020-03-06 20:07:15 +01:00
Pierre-antoine Comby
08b97e722b add support for cropping image. WIP. 2020-03-05 23:32:01 +01:00
Pierre-antoine Comby
2e8505e9b4 ménage dans les imports 2020-03-04 16:34:52 +01:00
Pierre-antoine Comby
fd74080ce3 profile picture update view is working 2020-03-04 16:34:12 +01:00
Pierre-antoine Comby
c4198a64af add button for profile pic view 2020-03-03 14:45:50 +01:00
Pierre-antoine Comby
f992c117f4 rename second_form to profile_form 2020-03-03 14:25:16 +01:00
Pierre-antoine Comby
901454f338 rename template for consistency 2020-03-03 11:05:02 +01:00
Pierre-antoine Comby
b7e68722aa front improvement on alias page 2020-03-01 16:20:13 +01:00
Pierre-antoine Comby
35d5bcdf0f Deletion of alias now possible! 2020-03-01 00:25:53 +01:00
Pierre-antoine Comby
27391049f2 remove duplicated form 2020-02-28 16:12:35 +01:00
Pierre-antoine Comby
db95944574 add delete boutons, work with only one alias 2020-02-28 15:25:45 +01:00
Pierre-antoine Comby
c77bc0c032 add deleteView for aliases 2020-02-28 13:52:15 +01:00