ynerant
/
nk20
mirror of https://gitlab.crans.org/bde/nk20
1
0
Fork 0
Code Issues Releases Wiki Activity
970 Commits 20 Branches 4 Tags 27 MiB
Commit Graph

316 Commits

Author SHA1 Message Date
Yohann D'ANELLO 4108babdb4 Permissions can be permanent 2020-05-07 21:14:36 +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 968a44fee6 For a random reason, django filters templates are missing. Wtf? 2020-05-02 02:49:27 +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 368d285747 Display by default only visible buttons 2020-04-27 04:01:30 +02:00
Yohann D'ANELLO 5ea531fe68 Filter buttons list with visible buttons only 2020-04-27 03:56:22 +02:00
Yohann D'ANELLO 2bc2048076 RecurrentTransaction amount history 2020-04-27 03:21:13 +02:00
Yohann D'ANELLO a83ab4bf85 Add a public rights page to view which permissions are granted to which role, update Font Awesome to 5.13 2020-04-26 01:20:46 +02:00
Yohann D'ANELLO 957344922b Custom error pages 2020-04-25 19:29:18 +02:00
Yohann D'ANELLO e42680997f Translate all fields, remove old CAS client configuration, remove packaged templates in source 2020-04-25 15:54:29 +02:00
Yohann D'ANELLO cdff0d3893 We can view and update our WEI registration while we are not fully registered to the WEI. 2020-04-24 14:30:18 +02:00
Yohann D'ANELLO 16079e3cc5 Fix broken WEI permissions 2020-04-24 14:03:25 +02:00
Yohann D'ANELLO d4ddbc3565 Add script to export the WEI registrations as CSV format 2020-04-23 21:13:33 +02:00
Yohann D'ANELLO b81f186866 Add PDF member lists 2020-04-23 18:28:16 +02:00
Yohann D'ANELLO c31fb0c13d Add department and promotion in Profile model 2020-04-22 16:25:09 +02:00
Yohann D'ANELLO 640f0f9a31 Don't delete Sogé credits if the user don't have enough money on its note, stay positive :) 2020-04-22 03:57:19 +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 f83f6da79a Better tables 2020-04-21 17:49:06 +02:00
Yohann D'ANELLO 73878d03ab Delete registrations 2020-04-21 01:06:54 +02:00
Yohann D'ANELLO 1c7d4fbbec 2A+ can select a bus (and fix random bugs) 2020-04-21 00:07:00 +02:00
Yohann D'ANELLO 47b9b53591 Protect all from update if the WEI is ended (or not started), remove useless fixture 2020-04-20 04:53:26 +02:00
Yohann D'ANELLO 16af9ac0ea Improve survey, comment code 2020-04-20 01:26:53 +02:00
Yohann D'ANELLO 473d3c3546 Integrate survey results into validation form 2020-04-19 22:16:57 +02:00
Yohann D'ANELLO 8113c5cd61 WEI Survey (work in progress) 2020-04-19 20:35:49 +02:00
Yohann D'ANELLO b62fa4cc6d Register users themselves 2020-04-18 03:55:30 +02:00
Yohann D'ANELLO 0c9409fd4b Improve WEI UI 2020-04-18 03:27:12 +02:00
Yohann D'ANELLO d7da876a23 Add a link to register 1A 2020-04-17 21:48:50 +02:00
Yohann D'ANELLO 6d0ae80610 Update translations (better when uniform...) 2020-04-17 18:33:02 +02:00
Yohann D'ANELLO 96ad5385b0 Distinguish new and old members 2020-04-17 00:48:54 +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 0bf958dbd6 Edit and view teams 2020-04-13 21:16:52 +02:00
Yohann D'ANELLO 840376a4f5 Add teams 2020-04-13 06:01:27 +02:00
Yohann D'ANELLO 822853be66 Add a bus 2020-04-13 05:02:16 +02:00
Yohann D'ANELLO 6242e316ae Update pre-registrations 2020-04-12 04:39:57 +02:00
Yohann D'ANELLO bdb0f677e5 List pre-registrations (TODO: filter) 2020-04-12 04:29:44 +02:00
Yohann D'ANELLO 6b8e9d45fd Pre-register 2A+ 2020-04-12 03:31:08 +02:00
Yohann D'ANELLO ea8e25a7b3 Create WEI 2020-04-12 02:43:22 +02:00
Yohann D'ANELLO 69b7f31eed Add lorem ipsum, update WEI 2020-04-12 02:30:48 +02:00
Yohann D'ANELLO 8fe060847f Display note information larger 2020-04-12 02:07:13 +02:00
Yohann D'ANELLO 7ad32c2afd View detail of a WEI 2020-04-12 00:06:20 +02:00
Yohann D'ANELLO 31d2224b8f List wei 2020-04-11 23:02:12 +02:00
Yohann D'ANELLO a609d7c995 Fix credit/debit tabs 2020-04-10 23:41:13 +02:00
Alexandre Iooss 7af76899e3
Simplify grids 2020-04-10 23:40:19 +02:00
Alexandre Iooss 700ad7c9f7
Make consume section more bootstrap 2020-04-10 23:15:25 +02:00
Alexandre Iooss 5c1e3dd0ca
Make tooltips opaque again 2020-04-10 22:51:26 +02:00
Alexandre Iooss 45c8fdf1c1
Revert margin for search field 2020-04-10 22:47:59 +02:00
Yohann D'ANELLO e4a44b0b4a Better transfer page 2020-04-10 22:43:55 +02:00
Alexandre Iooss 0608ebd9f2
Autofocus search field and layout 2020-04-10 22:38:35 +02:00
Alexandre Iooss 64499b65bb
Better tooltips and icons 2020-04-10 22:22:07 +02:00
Alexandre Iooss 57226a0733
Custom style for tooltips 2020-04-10 21:36:04 +02:00
Alexandre Iooss 442ac51373
Clean old search container 2020-04-10 21:28:33 +02:00
Alexandre Iooss 0c70f15721
Placeholder for note search input 2020-04-10 20:21:26 +02:00
Alexandre Iooss cf67e17e85
Do not use JavaScript to hide double conso after loading 2020-04-10 19:50:42 +02:00
Yohann D'ANELLO 658d402242 Notes of users that don't have validated their email addresses are displayed with a different background 2020-04-10 02:56:56 +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
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 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 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 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 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 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 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
Pierre-antoine Comby 6ea59a4603 Merge branch 'master' into tranfer_front 2020-03-28 17:47:20 +01:00
Pierre-antoine Comby 948263a867 color codes from note balances 2020-03-28 17:44:22 +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 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 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 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 ee3d441a56 add parent club link 2020-03-27 14:04:30 +01:00
Yohann D'ANELLO f81e2b5b5b Use custom inputs for date picker and amounts 2020-03-27 13:50:02 +01:00