Ludovic Stephan
732e47707e
Add unsubscribe option + list of current draws
2017-10-23 17:25:58 +02:00
Evarin
adf43889e1
Fixtures site cof
2017-10-23 11:05:49 +02:00
Martin Pepin
cb820e1414
Merge branch 'aureplop/fix-tirage-pk-conflict' into 'test/views'
...
Fix tirage pk conflicts with postgres
See merge request !262
2017-10-18 11:40:02 +02:00
Aurélien Delobelle
46187659ed
Fix tirage pk conflicts with postgres
2017-10-17 14:42:39 +02:00
Martin Pépin
fccad5edee
rename root -> kfet_genericteam in fixtures
2017-10-16 14:31:02 +02:00
Martin Pépin
b9aaea0f99
Merge branch 'master' into Production
2017-10-16 14:26:05 +02:00
Martin Pepin
47e48e36b2
Merge branch 'aureplop/fix-unreachable-objects-form-creation' into 'test/views'
...
Fix fields cleaning with unreachable items when…
See merge request !260
2017-10-12 19:21:16 +02:00
Aurélien Delobelle
85657591f5
Fix fields cleaning with unreachable items when…
...
… object is being created.
2017-10-12 11:10:30 +02:00
Aurélien Delobelle
c59bc487c3
Merge branch 'test/views__' into test/views
2017-10-11 23:35:38 +02:00
Aurélien Delobelle
f4a7e9dbf1
Verbosity should stay calm.
2017-10-11 23:34:43 +02:00
Aurélien Delobelle
03deb54d92
Merge branch 'Kerl/fix-JSONField-exn' into 'master'
...
djangorestframework 3.7 breaks with Django 1.8
See merge request !259
2017-10-11 23:18:05 +02:00
Martin Pépin
3b1d8487e2
Merge branch 'aureplop/kfet-auth_backends'
2017-10-11 22:59:28 +02:00
Martin Pépin
f8bb5b081e
Merge branch 'Kerl/fix-JSONField-exn' into test/views
2017-10-10 21:37:40 +02:00
Martin Pépin
3f6c5be748
Upgrade python packages before testing
2017-10-10 21:27:15 +02:00
Martin Pépin
e0ab7f5f94
Fix migration conflict
2017-10-10 21:21:28 +02:00
Martin Pépin
116b4da1a5
Merge branch 'test/views_kfet' into test/views
2017-10-10 21:15:49 +02:00
Martin Pépin
29ef297b2a
try to set the redis password…
2017-10-10 21:14:52 +02:00
Martin Pépin
503b305299
djangorestframework 3.7 breaks with Django 1.8
...
JSONField doesn't exist in Django 1.8
2017-10-10 18:34:18 +02:00
Martin Pépin
3d22a1b029
Merge branch 'master' into test/views
2017-10-10 15:39:18 +02:00
Martin Pépin
528532cca7
Merge branch 'aureplop/fix-ci'
2017-10-10 15:35:22 +02:00
Martin Pépin
4d1cb3c2d7
Set password for redis in CI
2017-10-10 15:26:14 +02:00
Evarin
5a22b1cd37
Affichage des actus
2017-10-10 11:22:02 +02:00
Aurélien Delobelle
57a143e0e1
Merge branch 'PEI' into 'master'
...
Statut PEI + cotisation gratuite
See merge request !258
2017-10-06 11:06:44 +02:00
Martin Pépin
435e211b3d
Add a "PEI" status + "Gratis" subscription fees
2017-10-02 13:58:52 +02:00
Aurélien Delobelle
596868f5b6
plop
2017-09-30 03:03:48 +02:00
Evarin
0e19abb51a
Cleaner homepage
2017-09-27 23:58:50 +02:00
Martin Pépin
b73faa3b84
Merge branch 'master' into Production
2017-09-25 18:40:00 +02:00
Martin Pepin
22413d861c
Merge branch 'aureplop/fix-attributions-admin' into 'master'
...
Fix attribution inlines of participant in admin
See merge request !255
2017-09-25 18:38:05 +02:00
Aurélien Delobelle
d18fb86a98
Fix attribution inlines of participant in admin
2017-09-25 18:26:54 +02:00
Aurélien Delobelle
b42452080f
Mass cleaning of kfet' authentication machinery
...
AccountBackend
- Should now work if used in AUTHENTICATION_BACKENDS settings.
- It does not retieve itself the password, as it should not be used
this way.
GenericBackend
- Delete useless 'username' arg of its 'authenticate()' method.
- Now delete the token in DB.
TemporaryAuthMiddleware
- New name of the middleware is more meaningful.
- Is now responsible to retrieve the password from the request, instead
of the AccountBackend.
GenericTeamToken model
- Add a manager' method to create token, avoiding possible error due to
unicity constraint.
GenericLoginView (authentication with the kfet generic user)
- Replace obscure system with a 100% HTTP handling.
- See comments for more information.
Misc
- More docstrings!
- More tests!
- Add some i18n.
- Add kfet/confirm_form.html template:
Ask user to confirm sth via a form (which will send a POST request).
Context variables:
* title: the page title
* confirm_url: action attribute for <form>
* text: displayed confirmation text
- kfet.js : Add functions allowing to emit POST request from <a> tag.
- Non-link nav items from kfet navbar also get a 'title'.
- A utility has been found for the 'sunglasses' glyphicon!
2017-09-25 17:57:47 +02:00
Aurélien Delobelle
11e8cb1be2
Merge branch 'bdaAdminHotfix' into 'master'
...
Hotfix : répare l'admin, le champ "given" n'était pas affiché quand il faut
See merge request !254
2017-09-25 15:01:28 +02:00
Martin Pépin
db512a97f6
In /admin: displays "given" when it's relevant
2017-09-25 14:22:46 +02:00
Aurélien Delobelle
3fa7754ff4
KFet Backends inherit from BaseKFetBackend
...
Users who authenticate via a KFetBackend got extra select related.
It should save 2 db queries on each request for these users.
2017-09-23 20:48:28 +02:00
Aurélien Delobelle
e5d19811e8
Clean code related to kfet password
2017-09-22 23:31:46 +02:00
Aurélien Delobelle
1d19d1797c
Clean setup/retrieve of kfet generic account
2017-09-22 01:24:44 +02:00
Martin Pépin
6f2652c485
Prod quick hack for Mega export
2017-09-20 18:23:36 +02:00
Martin Pépin
d89ba1efe5
Fix catalogue behaviour if id=0
2017-09-20 18:21:59 +02:00
Martin Pépin
4091185a68
import LDAP_SERVER_URL in settings
2017-09-20 18:19:15 +02:00
Aurélien Delobelle
bf61e41b50
Move auth-related from 'kfet' app to 'kfet.auth'.
2017-09-19 17:05:51 +02:00
Hugo Roussille
a4eedbc1a6
Whitelist bda and cof apps for cross-domain
2017-09-13 18:21:34 +02:00
Hugo Roussille
4bd2562edf
django-cors-headers for cross-domain AJAX
2017-09-13 15:57:57 +02:00
Martin Pepin
7d16001ee5
Merge branch 'aureplop/fix_kfet_perms' into 'master'
...
K-Fêt' groups edits don't remove non-kfet app permissions.
Closes #168
See merge request !252
2017-09-12 22:35:30 +02:00
Martin Pépin
1921f05eba
Move STATIC_ROOT in production
2017-09-12 09:22:54 +02:00
Martin Pépin
368ee3190f
Update CI: use postgres
2017-09-12 00:14:52 +02:00
Aurélien Delobelle
9e61887868
K-Fêt' groups edits don't remove non-kfet app permissions.
...
Fixes #168 .
2017-09-11 16:42:14 +02:00
Martin Pépin
faed7bff73
fix ?next=… on K-Fêt logout
2017-09-10 02:32:21 +02:00
Martin Pepin
f581279825
Merge branch 'aureplop/fix-kfet-navbar' into 'master'
...
Fix kfet navbar on small devices
See merge request !248
2017-09-10 02:12:49 +02:00
Martin Pépin
937a485704
Merge branch 'master' into Production
2017-09-09 22:03:32 +02:00
Martin Pépin
439f49c3ba
We ♥ hardcoding stuff…
2017-09-05 15:21:19 +02:00
Martin Pépin
35b352ac1d
Fix mistake introduced in 51f4bf3fb5
2017-09-04 14:50:12 +02:00
