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

2076 Commits

Author SHA1 Message Date
erdnaxe af07ed9807 Merge branch 'erdnaxe-master-patch-99095' into 'beta' 
Erdnaxe master patch 99095

See merge request bde/nk20!132
 2020-10-05 16:37:14 +02:00
erdnaxe bbe53b3b63 Update README.md 2020-10-05 16:25:06 +02:00
ynerant 536f0ec226 Merge branch 'beta' into 'master' 
Ensure the integrity of all note balances in multiple transactions

See merge request bde/nk20!131
 2020-10-04 22:12:12 +02:00
Yohann D'ANELLO 541ed59f40 When a membership is created, redirect to the user profile page rather than club detail 2020-10-04 21:08:35 +02:00
Yohann D'ANELLO e172b4f4bb When a membership is renewed, set the same roles as the previous membership 2020-10-04 20:54:03 +02:00
Yohann D'ANELLO d666179037 Display Renew membership button 15 days more 2020-10-04 20:50:10 +02:00
Yohann D'ANELLO f22e92132c Select for update transaction notes, and not only the transaction 2020-10-04 20:47:15 +02:00
Yohann D'ANELLO ca7ad05746 Use a signal to prevent a user that the note balance is negative 2020-10-04 20:26:43 +02:00
Pierre-antoine Comby f55ca2f725 Merge branch 'beta' into 'master' 
remove the display limit for pre-registred users.

See merge request bde/nk20!130
 2020-10-03 18:07:39 +02:00
Pierre-antoine Comby d4e4ed580f remove the display limit for pre-registred users. 2020-10-03 17:53:38 +02:00
ynerant 8756751344 Merge branch 'beta' into 'master' 
Fix some membership issues

See merge request bde/nk20!129
 2020-10-01 15:00:36 +02:00
Yohann D'ANELLO fd83fe19bf Fix some membership date control 2020-10-01 09:17:02 +02:00
Yohann D'ANELLO a00d95608b Add permission to treasurers to create a club, fix the permission check to renew a membership 2020-09-23 21:36:04 +02:00
ynerant 3303edd01f Merge branch 'beta' into 'master' 
OAuth2, no side effect permissions

See merge request bde/nk20!128
 2020-09-23 18:44:40 +02:00
Yohann D'ANELLO e48ef92137 Revert commit that broke beta branch 2020-09-23 18:32:09 +02:00
erdnaxe 919d0b7e85 Merge branch 'ics_cache' into 'beta' 
Ics cache

See merge request bde/nk20!127
 2020-09-21 15:46:34 +02:00
Alexandre Iooss 439bf35b62
APT python memcache is PyPi memcached 2020-09-21 15:25:07 +02:00
Alexandre Iooss 74b26335d1
Cache ICS calendar 2020-09-21 15:13:59 +02:00
Alexandre Iooss 3d733ed6af
Use memcached cache 2020-09-21 15:13:43 +02:00
erdnaxe d54ab94ceb Merge branch 'oauth' into 'beta' 
Oauth

See merge request bde/nk20!126
 2020-09-21 12:53:03 +02:00
Alexandre Iooss 4f188ca3e5 Admin is autodiscovering partially 2020-09-21 12:34:34 +02:00
Alexandre Iooss 72bac75fbd Add Django OAuth toolkit admin 2020-09-21 12:15:40 +02:00
Alexandre Iooss 6d54aae614
Fix django-oauth-toolkit version 2020-09-21 11:15:00 +02:00
Alexandre Iooss 8052152ea5
Add OAuth2 endpoints 2020-09-21 11:03:07 +02:00
Alexandre Iooss 70448db8e5
Remove Django CAS server and add oauth toolkit 2020-09-21 10:31:42 +02:00
ynerant ac2d1e8111 Merge branch 'no_side_effect_permission_check' into 'beta' 
No side effect permission check

See merge request bde/nk20!124
 2020-09-20 11:24:46 +02:00
Yohann D'ANELLO 3ba61385a3 Debit is not credit 2020-09-20 11:12:44 +02:00
Yohann D'ANELLO 7353348d7a Rollback transaction when checking an add permission (experimental) 2020-09-20 09:07:51 +02:00
Yohann D'ANELLO f63e2e088e Don't log when the permission to lock a note is checked 2020-09-20 08:56:42 +02:00
elkmaennchen 420a24ebac enable JavaScriptCatalog view 2020-09-19 22:42:35 +02:00
elkmaennchen d566def706 Try to translate js, not working... 2020-09-19 22:03:45 +02:00
Yohann D'ANELLO eaf6769e8b Treasurers can make transactions with people that are no longer a member 2020-09-19 16:33:52 +02:00
Yohann D'ANELLO a61ec81cff note.crans.org is the default domain 2020-09-19 16:03:32 +02:00
Yohann D'ANELLO 60f2a73cc5 Don't check if the user is a member of the parent club if there is no parent club 2020-09-18 13:35:55 +02:00
Yohann D'ANELLO bcd96b2ed8 The BDE membership and the club membership must now be in two parts 2020-09-18 12:35:36 +02:00
ynerant 5c702187e5 Merge branch 'beta' into 'master' 
Corrections diverses

See merge request bde/nk20!123
 2020-09-14 10:16:13 +02:00
Yohann D'ANELLO 905d65371f The user validation form was ugly 2020-09-14 09:56:15 +02:00
Yohann D'ANELLO 180cd3e1ec Fix registration permissions and procedure 2020-09-14 09:49:30 +02:00
ynerant 73ca65aa91 Merge branch 'atomicity' into 'beta' 
Atomicité

See merge request bde/nk20!122
 2020-09-14 09:38:54 +02:00
Yohann D'ANELLO 5ed0560953 Fix linting 2020-09-14 09:09:20 +02:00
Yohann D'ANELLO dbc6fbbf71 Fix the validation clicker issue, now the note is safe 2020-09-14 09:05:35 +02:00
Yohann D'ANELLO 872fd8f86d Don't cache permissions in debug mode, that's very slow 2020-09-14 08:58:12 +02:00
Yohann D'ANELLO f89234b69a JS was broken, please close your HTML tags 2020-09-13 23:18:00 +02:00
Alexandre Iooss 36a980555b Revert "Make the nk20 usable for pirates" 
This reverts commit 0f53ac45f7.
 2020-09-13 20:42:44 +02:00
Alexandre Iooss 826cd4d87f Revert "Use underscore in locales" 
This reverts commit 2270a0aa82.
 2020-09-13 20:42:34 +02:00
Alexandre Iooss e8005a6c58 Update Django locale selector 2020-09-13 20:17:59 +02:00
Alexandre Iooss 2270a0aa82 Use underscore in locales 2020-09-13 20:10:26 +02:00
Alexandre Iooss 0f53ac45f7
Make the nk20 usable for pirates 2020-09-13 20:05:06 +02:00
erdnaxe 670556c59e Merge branch 'traduction' into 'beta' 
End of Spanish translation

See merge request bde/nk20!121
 2020-09-13 18:55:56 +02:00
elkmaennchen 5b02ba48e0 Some OTL, but so much remain 2020-09-13 12:40:10 +02:00