ynerant/nk20
1
0
Fork 0
mirror of https://gitlab.crans.org/bde/nk20 synced 2024-11-26 10:27:07 +00:00
Code Issues Releases Wiki Activity
1,863 Commits 20 Branches 4 Tags 27 MiB
b3353b563c
Commit Graph

358 Commits

Author SHA1 Message Date
Yohann D'ANELLO
a9258c332a Order note research results: match first aliases then normalized names 2020-08-30 22:33:59 +02:00
Yohann D'ANELLO
374e6ed7f8 💚 Fix CI 2020-08-30 11:59:10 +02:00
Alexandre Iooss
4cb162de87 Card for wei templates 2020-08-25 18:36:49 +02:00
Alexandre Iooss
1fd37bb1ce Smaller membership renew btn 2020-08-25 16:44:01 +02:00
Alexandre Iooss
e3785e11f1 Cards everywhere in member app 2020-08-25 16:30:02 +02:00
Alexandre Iooss
2e659c63cd Member templates inherit from member/base.html 2020-08-25 15:39:57 +02:00
Alexandre Iooss
63dc184ce4 Do not list alias on profile page 2020-08-25 15:05:50 +02:00
Alexandre Iooss
e14c8734c2 Template formating on member app 2020-08-23 14:21:31 +02:00
Alexandre Iooss
44b7fe8f52 List aliases on profile page 2020-08-23 12:07:04 +02:00
Alexandre Iooss
cbc3e39bd6 Create base template for member and wei 2020-08-23 10:06:16 +02:00
Alexandre Iooss
1c16d6ef18 Use block.parent to extend content 2020-08-23 09:56:42 +02:00
Alexandre Iooss
0ba77fb8f0 Make alias form a bit more HTML friendly 2020-08-23 00:33:36 +02:00
Alexandre Iooss
342d3910c7 Set fluid container on parent template 2020-08-23 00:03:10 +02:00
Alexandre Iooss
2c1cf148fa Remove alias_update.html 2020-08-22 23:55:22 +02:00
Alexandre Iooss
196f796570 Move alias.js to local static 2020-08-22 23:54:58 +02:00
Alexandre Iooss
9cad8fcc65 Simplify future user search 2020-08-22 10:13:48 +02:00
Alexandre Iooss
8465b24d7d Use base search for club list 2020-08-21 23:20:45 +02:00
Alexandre Iooss
aa98c4848d Create base template for search page 2020-08-21 23:11:25 +02:00
Alexandre Iooss
83d2c18d1e Debounce user search 2020-08-21 19:12:28 +02:00
Alexandre Iooss
5ea1eed76d Password reset use cards 2020-08-21 18:34:20 +02:00
Yohann D'ANELLO
c090b4af76 Superusers can see their note even if they have no membership for local dev 2020-08-20 23:13:27 +02:00
Pierre-antoine Comby
a1dc8fe530 fix trailing comma 2020-08-19 23:00:49 +02:00
Pierre-antoine Comby
60b1cdbcf8 comments member views 2020-08-18 18:19:39 +02:00
Yohann D'ANELLO
b8c3dda95b Replace timezone.now().date() by date.today() 2020-08-16 00:35:13 +02:00
Yohann D'ANELLO
9f258e39b6 Check that the user is a member of the parent club only at the creation of the membership 2020-08-15 23:52:57 +02:00
Yohann D'ANELLO
4997a37058 Ensure that the user is authenticated before that it has the permission to see page 2020-08-15 23:27:58 +02:00
Yohann D'ANELLO
5f8c4a2857 Prevent time travelers to register in the note 2020-08-15 21:30:08 +02:00
Yohann D'ANELLO
430036bfc2 Don't display "change password" button on other profile pages 2020-08-15 20:59:45 +02:00
Yohann D'ANELLO
d6fd925fdd Display email and phone number in profile page 2020-08-15 20:40:11 +02:00
Yohann D'ANELLO
75cd34f5dd Enlarge buttons table and transactions table 2020-08-15 20:04:19 +02:00
Yohann D'ANELLO
0bf5067b60 Fix linters 2020-08-15 19:10:23 +02:00
Yohann D'ANELLO
d962763987 datetime.today() => date.today() 2020-08-14 19:04:44 +02:00
Yohann D'ANELLO
f5f379e6ad BooleanField -> CharField (a locale name is not a boolean) 2020-08-13 19:48:15 +02:00
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