Yohann D'ANELLO
|
0e8058ab0d
|
Add script to send weekly report to all members
|
2020-08-03 19:35:25 +02:00 |
Yohann D'ANELLO
|
655390b265
|
A longer transaction history is better
|
2020-08-03 18:50:51 +02:00 |
Yohann D'ANELLO
|
985a5ca876
|
➕ Add "search transactions page"
|
2020-08-03 18:49:15 +02:00 |
Yohann D'ANELLO
|
5ea8d8f870
|
🎨 Update activity interface
|
2020-08-03 16:11:05 +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
|
66defee3ea
|
🐛 Display the invalidity reason of an invalid transaction even if we can't validate it
|
2020-08-03 11:41:06 +02:00 |
Yohann D'ANELLO
|
f8a4087e56
|
🐛 Display full registration table when the search bar is empty
|
2020-08-03 11:32:37 +02:00 |
Yohann D'ANELLO
|
94086505e6
|
Fix note balances
|
2020-08-03 11:16:01 +02:00 |
Yohann D'ANELLO
|
0e8174aacd
|
🐛 Fix objects with pk 0
|
2020-08-03 10:50:55 +02:00 |
Yohann D'ANELLO
|
58fe8914cf
|
🐛 Fix infinite loop in permission check
|
2020-08-02 22:39:30 +02:00 |
Yohann D'ANELLO
|
f870af139e
|
Typos
|
2020-08-02 09:51:39 +02:00 |
Yohann D'ANELLO
|
7742358b8f
|
Secretaries can view and add memberships
|
2020-08-02 09:49:45 +02:00 |
Yohann D'ANELLO
|
8de7ba14bd
|
Add permission for secretaries
|
2020-08-02 09:35:32 +02:00 |
Yohann D'ANELLO
|
8497dbb25c
|
Club members can see the club
|
2020-08-02 09:30:18 +02:00 |
Yohann D'ANELLO
|
2f018f8c9d
|
Always query distinct objects
|
2020-08-02 08:57:16 +02:00 |
Yohann D'ANELLO
|
0ae61f3643
|
BDE memberships can start on 1st august
|
2020-08-02 08:47:23 +02:00 |
Yohann D'ANELLO
|
b706efe463
|
2A+ can change their selected bus or team if the registration is not validated
|
2020-08-01 23:27:07 +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
|
8434841ec5
|
Fix one permission
|
2020-08-01 22:28:28 +02:00 |
Yohann D'ANELLO
|
efc2b6b0b0
|
Send mail to users when the note balance is negative
|
2020-08-01 21:44:16 +02:00 |
Yohann D'ANELLO
|
51fbde23b9
|
Add note consistency check script
|
2020-08-01 18:06:53 +02:00 |
Yohann D'ANELLO
|
36f1a3f0d4
|
Activity admin site was missing
|
2020-08-01 18:05:31 +02:00 |
Yohann D'ANELLO
|
cc04fa5555
|
default=timezone.default is better than auto_now_add=True
|
2020-08-01 17:49:23 +02:00 |
Yohann D'ANELLO
|
43a22cbed4
|
💩 Fix account import
|
2020-08-01 16:37:54 +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
|
377397b319
|
🐛 Fix WEI tables
|
2020-08-01 15:59:39 +02:00 |
Yohann D'ANELLO
|
7c369bd264
|
Update the balance of the Kfet club and import creation dates
|
2020-08-01 15:16:50 +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
|
d7b834d908
|
Translate rights
|
2020-07-31 22:29:23 +02:00 |
Yohann D'ANELLO
|
dca655949e
|
Improve transfer UI
|
2020-07-31 21:24:23 +02:00 |
Yohann D'ANELLO
|
8409ee4cc4
|
Display "Create WEI" button only for people that can create a WEI, see #53
|
2020-07-31 17:15:31 +02:00 |
Yohann D'ANELLO
|
9008baad3a
|
Better alias research, closes #51
|
2020-07-31 17:07:14 +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
|
2642ae3a1a
|
🐛 Scripts subproject has disappeared
|
2020-07-30 20:41:19 +02:00 |
Yohann D'ANELLO
|
ad2cc22964
|
Transactions are not invalidable if the user doesn't have the right to
|
2020-07-30 17:52:04 +02:00 |
Yohann D'ANELLO
|
ae629b55ad
|
Add HTML titles
|
2020-07-30 17:30:21 +02:00 |
Yohann D'ANELLO
|
a5e50e5de6
|
Display true note name next to the alias, whenever the user has low permissions
|
2020-07-30 16:48:34 +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
|
9d8c588b78
|
Buttons list didn't work as well
|
2020-07-30 15:49:59 +02:00 |
Yohann D'ANELLO
|
9361f3f2f0
|
Aliases should load really faster
|
2020-07-30 15:07:30 +02:00 |
Yohann D'ANELLO
|
e63219f7ad
|
Force delete some objects
|
2020-07-30 14:58:18 +02:00 |
Yohann D'ANELLO
|
0c0aed0234
|
🐛 Force delete didn't work as well when trying to check add permissions
|
2020-07-30 13:10:03 +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
|
cbd36f110a
|
Another uplicated permission
|
2020-07-29 19:13:29 +02:00 |
Yohann D'ANELLO
|
c9e68ca66b
|
Duplicated permission
|
2020-07-29 19:12:16 +02:00 |
Yohann D'ANELLO
|
20011db37e
|
Order aliases by name
|
2020-07-29 19:03:11 +02:00 |
Yohann D'ANELLO
|
5a91cac08d
|
Add permissions to see clubs and users
|
2020-07-29 18:37:42 +02:00 |
Yohann D'ANELLO
|
fa9159bb28
|
Alias pk != Note pk
|
2020-07-29 17:50:14 +02:00 |
Yohann D'ANELLO
|
4549255198
|
Treasurers can update invalidity reason
|
2020-07-29 17:42:06 +02:00 |
Yohann D'ANELLO
|
750bdcb2c5
|
Treasurers can of course click on buttons. Fix PATCH requests on the API
|
2020-07-29 12:25:53 +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
|
3a4145e4d9
|
Woops, roles didn't have the permissions
|
2020-07-28 20:56:22 +02:00 |
Yohann D'ANELLO
|
54ce157019
|
Store clothing cut and size in WEI registration
|
2020-07-28 20:49:32 +02:00 |
Yohann D'ANELLO
|
7c6bab88f4
|
Update permissions to see buses
|
2020-07-28 20:22:10 +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
|
0bfc3b9454
|
Not-yet-registered WEI members can see their registrations
|
2020-07-28 18:09:43 +02:00 |
Yohann D'ANELLO
|
84e8b02594
|
🐛 Calculating permissions faster
|
2020-07-28 15:25:08 +02:00 |
Yohann D'ANELLO
|
09027ea35e
|
Store transactions by default
|
2020-07-27 00:16:28 +02:00 |
Yohann D'ANELLO
|
2f334e0707
|
Fix remittance import
|
2020-07-26 23:59:18 +02:00 |
Yohann D'ANELLO
|
e163f86f69
|
Section is not importable yet
|
2020-07-26 12:11:17 +02:00 |
Yohann D'ANELLO
|
0335a47667
|
Anonymize data, fix remittance import, better Ansible
|
2020-07-26 12:05:41 +02:00 |
Yohann D'ANELLO
|
b8d4fb9df1
|
🐛 Don't import only the last remittance...
|
2020-07-26 09:06:08 +02:00 |
Yohann D'ANELLO
|
8cde94c5f5
|
Import remittances
|
2020-07-26 01:01:21 +02:00 |
Yohann D'ANELLO
|
4c29d855d2
|
Fix RolePermissions merge
|
2020-07-25 20:07:45 +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
|
18bdc8044b
|
🐛 Minor fixes
|
2020-07-25 18:26:18 +02:00 |
Yohann D'ANELLO
|
f0bca69825
|
🐛 Minor fixes
|
2020-07-25 18:18:53 +02:00 |
Yohann D'ANELLO
|
afb35d7ae0
|
Fix linters
|
2020-07-25 17:42:44 +02:00 |
Yohann D'ANELLO
|
b212bf4093
|
Fix linters
|
2020-07-25 17:42:32 +02:00 |
Yohann D'ANELLO
|
2eb601bd66
|
💥 Improve performances
|
2020-07-25 17:25:57 +02:00 |
Yohann D'ANELLO
|
50024dc03d
|
🐛 Fix NK15 import
|
2020-07-23 07:21:49 +02:00 |
Yohann D'ANELLO
|
e3045522d1
|
Bind GuestTransaction to entry rather than guest (fix OneToOneField)
|
2020-07-22 21:05:25 +02:00 |
Yohann D'ANELLO
|
a098f70424
|
Better import
|
2020-07-22 01:46:31 +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
|
71f6daf0e8
|
Add permission for treasurers to update the validation status of a transaction
|
2020-07-13 12:10:01 +02:00 |
Yohann D'ANELLO
|
2c7995a79e
|
A transaction can only be created between active notes
|
2020-06-21 22:47:05 +02:00 |
Yohann D'ANELLO
|
ac5041f3ec
|
Better club search bar
|
2020-06-21 22:27:32 +02:00 |
Yohann D'ANELLO
|
b46854e479
|
Rework on Docker image
|
2020-06-21 20:27:42 +02:00 |
Pierre-antoine Comby
|
a90eb2a6eb
|
Merge branch 'order_table' into 'master'
order table of club for Pollion
See merge request bde/nk20!84
|
2020-06-02 09:43:12 +02:00 |
Pierre-antoine Comby
|
f2ac0cd8cf
|
order table of club for Pollion
|
2020-06-02 09:37:25 +02:00 |
Yohann D'ANELLO
|
302f9e752c
|
Create a test to check that permission queries are well formed
|
2020-05-30 15:46:09 +02:00 |
Yohann D'ANELLO
|
a9ccf46010
|
Linters
|
2020-05-29 21:43:24 +02:00 |
Yohann D'ANELLO
|
f567b1a343
|
Activity list is displayed in the right order
|
2020-05-29 21:37:44 +02:00 |
Yohann D'ANELLO
|
155b2df330
|
Fix some permissions, users can log in
|
2020-05-29 21:26:05 +02:00 |
Yohann D'ANELLO
|
716232e27f
|
With distinct permissions, we don't need to check ~ 100 000 permissions to check if someone can log in
|
2020-05-29 21:11:51 +02:00 |
Yohann D'ANELLO
|
c62b5f935a
|
Merge remote-tracking branch 'origin/master' into beta-soon
# Conflicts:
# apps/scripts
|
2020-05-29 21:11:14 +02:00 |
Pierre-antoine Comby
|
f468c2f939
|
Merge branch 'import_nk15' into 'master'
Import nk15
See merge request bde/nk20!81
|
2020-05-25 22:09:52 +02:00 |
Pierre-antoine Comby
|
79fbe96fe1
|
updates scripts
|
2020-05-25 12:26:33 +02:00 |
Pierre-antoine Comby
|
110ef79951
|
move wei script to wei app
|
2020-05-14 15:16:10 +02:00 |
Yohann D'ANELLO
|
f7b68678d8
|
Prepare production, we will send mails
|
2020-05-08 15:59:31 +02:00 |
Yohann D'ANELLO
|
4108babdb4
|
Permissions can be permanent
|
2020-05-07 21:14:36 +02:00 |
Yohann D'ANELLO
|
fdf373d1d5
|
Merge remote-tracking branch 'origin/master' into import_nk15
# Conflicts:
# apps/treasury/signals.py
|
2020-05-07 19:01:23 +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
|
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
|
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
|
b0f6ec1061
|
Remove debug print line
|
2020-04-26 01:19:19 +02:00 |
Yohann D'ANELLO
|
957344922b
|
Custom error pages
|
2020-04-25 19:29:18 +02:00 |
Yohann D'ANELLO
|
f35246c9e2
|
Send a mail to webmasters when an error occurs (in production mode)
|
2020-04-25 19:29:01 +02:00 |
Yohann D'ANELLO
|
705313edb6
|
Add Bus information in the WEI survey "api"
|
2020-04-24 19:34:20 +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
|
96a87483cc
|
Order registration by promotion rather than by roles
|
2020-04-24 14:05:06 +02:00 |
Yohann D'ANELLO
|
16079e3cc5
|
Fix broken WEI permissions
|
2020-04-24 14:03:25 +02:00 |
Yohann D'ANELLO
|
edf2f793e2
|
Fields were missing in the generated CSV, better to be coherent with the header
|
2020-04-23 21:29:43 +02:00 |
Yohann D'ANELLO
|
60b579f7c6
|
Update the generation of the PDF files for WEI registrations (now borderless and smaller)
|
2020-04-23 21:16:14 +02:00 |
Yohann D'ANELLO
|
b81f186866
|
Add PDF member lists
|
2020-04-23 18:28:16 +02:00 |
Yohann D'ANELLO
|
38b32b0623
|
Update scripts README, fix make_su script
|
2020-04-23 15:40:38 +02:00 |
Yohann D'ANELLO
|
83bc017668
|
Move WEI scripts to the scripts app
|
2020-04-23 14:33:41 +02:00 |
Yohann D'ANELLO
|
05fa27ac57
|
Extract clubs mailing list
|
2020-04-22 20:02:30 +02:00 |
Yohann D'ANELLO
|
135cca18cc
|
Extract active members mailing list
|
2020-04-22 20:00:41 +02:00 |
Yohann D'ANELLO
|
1152a43af5
|
Extract mailing list registrations
|
2020-04-22 17:53:42 +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
|
a85a5bf8fe
|
Add initial WEI permissions
|
2020-04-22 13:28:52 +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
|
69ac5cd291
|
Revert changes on some comments
|
2020-04-19 20:45:59 +02:00 |
Yohann D'ANELLO
|
8113c5cd61
|
WEI Survey (work in progress)
|
2020-04-19 20:35:49 +02:00 |
Pierre-antoine Comby
|
6d27193ac4
|
update import script
|
2020-04-18 16:07:45 +02:00 |
Pierre-antoine Comby
|
038ddc2ab8
|
remittance need preciser check (bug during import)
|
2020-04-18 15:59:59 +02:00 |
Pierre-antoine Comby
|
cc97948c24
|
clean specialTransaction
|
2020-04-18 15:59:06 +02:00 |
Pierre-antoine Comby
|
53748cd534
|
frenglish -> english
|
2020-04-18 15:57:11 +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
|
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
|
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
|
a186ccbb26
|
Update WEI models
|
2020-04-11 17:42:08 +02:00 |
Yohann D'ANELLO
|
154ea64b9f
|
Launching WEI app, add models
|
2020-04-11 03:37:06 +02:00 |
Yohann D'ANELLO
|
a609d7c995
|
Fix credit/debit tabs
|
2020-04-10 23:41:13 +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
|
6477590cd4
|
Fix devalidation
|
2020-04-10 00:09:10 +02:00 |
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 |
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
|
d8949a993a
|
get alias and note infos together
|
2020-03-28 17:42:29 +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
|
09fb0e1470
|
Merge branch 'master' into front_club
|
2020-03-27 14:07:22 +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 |
Yohann D'ANELLO
|
45b14ed1bd
|
Create activities
|
2020-03-27 01:31:54 +01:00 |
Yohann D'ANELLO
|
213e5a8369
|
Fix CI
|
2020-03-27 00:40:35 +01:00 |
Yohann D'ANELLO
|
841d56d5b3
|
Merge remote-tracking branch 'origin/master' into activity
# Conflicts:
# note_kfet/urls.py
# templates/base.html
|
2020-03-27 00:32:22 +01:00 |
Pierre-antoine Comby
|
c50e17c555
|
error handling up to client
|
2020-03-26 23:05:37 +01:00 |
Pierre-antoine Comby
|
61b6aceb36
|
crappy name -> crappy behavior
|
2020-03-26 23:04:14 +01:00 |
Yohann D'ANELLO
|
a00e43bc26
|
Fix alias deletion
|
2020-03-26 21:04:32 +01:00 |
Pierre-antoine Comby
|
92ca835d0e
|
switch to template column
|
2020-03-26 17:47:49 +01:00 |
Pierre-antoine Comby
|
271fab3b75
|
use small btn in table
|
2020-03-26 17:46:38 +01:00 |
Pierre-antoine Comby
|
757dfdd914
|
serializer config
|
2020-03-26 17:45:24 +01:00 |
Pierre-antoine Comby
|
d9cdb01350
|
remove alias handling backend, gonna use DRF
|
2020-03-26 17:44:01 +01:00 |
Pierre-antoine Comby
|
7568abb681
|
some minor cleaning
|
2020-03-26 17:41:11 +01:00 |
Yohann D'ANELLO
|
01410d2b23
|
Store used aliases in transactions
|
2020-03-26 15:59:51 +01:00 |
Yohann D'ANELLO
|
41aa6964d2
|
Store used aliases in transactions
|
2020-03-26 14:45:48 +01:00 |