Aurélien Delobelle
3eb939928f
Merge branch 'master' into Kerl/tests
2018-09-30 13:08:58 +02:00
Aurélien Delobelle
10f4bd02d5
Merge branch 'master' into aureplop/cof-tests_registration
2018-09-30 12:57:35 +02:00
Aurélien Delobelle
064c23902b
cof.tests -- Address flake8 concerns
2018-09-30 12:56:58 +02:00
Aurélien Delobelle
44e5387f15
cof.tests -- Really check initial of built form
2018-09-30 12:56:36 +02:00
Martin Pépin
f297a1a0cf
update hardcoded Mega views for 2018…
2018-09-09 07:20:18 +02:00
Martin Pépin
a750c62baf
New year, new promotion: 2018
2018-09-02 23:27:21 +02:00
Martin Pépin
19c51c6a3a
Merge branch 'Kerl/unernestaparis'
2018-09-02 23:27:05 +02:00
Martin Pépin
327ef210db
make unernestaparis visible in forms
2018-09-02 23:26:18 +02:00
Martin Pépin
73cf39baa8
missing migration
2018-09-02 23:25:58 +02:00
Theo Delemazure
91393dcea7
Update models.py
2018-09-02 20:34:09 +02:00
Martin Pepin
a8bfedb28b
Merge branch 'Kerl/ci-py35' into 'master'
...
Utilise python 3.5 dans l'intégration continue
See merge request cof-geek/gestioCOF!306
2018-09-02 18:24:24 +02:00
Martin Pepin
92ca838601
Merge branch 'Kerl/changeemail' into 'master'
...
Les membres peuvent changer leur adresse email
See merge request cof-geek/gestioCOF!305
2018-09-02 18:24:03 +02:00
Martin Pépin
66184fbee6
CI: set python version to 3.5
2018-08-05 18:34:05 +02:00
Martin Pépin
898a354c2d
Members can change their registration email
2018-08-05 18:11:10 +02:00
Evarin
954a6fdb53
Wagtail requirement update
2018-06-30 15:52:58 +02:00
Evarin
6d6ba70bd7
CSS++
2018-06-30 15:38:12 +02:00
Ludovic Stephan
e515a55956
Merge branch 'aureplop/194-kfet_edit-account' into 'master'
...
kfet -- As a kfet staff, remove the requirement to…
Closes #194
See merge request cof-geek/gestioCOF!303
2018-06-16 17:13:17 +02:00
Aurélien Delobelle
645c01ebd1
kfet -- As a kfet staff, remove the requirement to…
...
provide a password in the edit view of an account.
2018-06-16 12:33:51 +02:00
Martin Pépin
68e71317cb
Hotfix: broken urls for mailing lists
2018-06-01 17:08:24 +02:00
Martin Pepin
96416bffea
Merge branch 'Aufinal/fix-revente-transfer' into 'master'
...
Fix le transfert des reventes
See merge request cof-geek/gestioCOF!302
2018-05-30 10:19:16 +02:00
Ludovic Stephan
12ae10f2c4
Fix le transfert des reventes
...
Il y avait une typo qui causait une erreur quand on voulait transférer
une revente.
2018-05-30 10:13:37 +02:00
Martin Pepin
af817534e4
Merge branch 'Aufinal/autocomplete-js' into 'master'
...
Fix autocomplete K-Psul
See merge request cof-geek/gestioCOF!301
2018-05-29 15:52:43 +02:00
Ludovic Stephan
837b48af36
Fix js path for autocomplete
2018-05-29 14:39:29 +02:00
Martin Pepin
c7cdf29129
Merge branch 'Kerl/issue193' into 'master'
...
Issue193 : lien cassé sur K-Psul
Closes #193
See merge request cof-geek/gestioCOF!300
2018-05-28 13:55:13 +02:00
Martin Pépin
7e9df3fc72
hotfix: wrong url name
2018-05-28 00:09:30 +02:00
Martin Pépin
b0301f0304
fix slugurl name error
2018-05-28 00:07:34 +02:00
Martin Pépin
2a9125ffaa
resolve migration conflict
2018-05-24 21:23:46 +02:00
Martin Pépin
483f192af3
Merge branch 'Production'
2018-05-24 21:23:01 +02:00
Martin Pepin
20cc2e7345
Merge branch 'aureplop/captcha' into 'master'
...
Upgrade to reCAPTCHA v2
Closes #192
See merge request cof-geek/gestioCOF!299
2018-05-14 17:55:37 +02:00
Aurélien Delobelle
ece9a54df3
Upgrade to reCAPTCHA v2
...
reCAPTCHA v1 has been shut down since March 2018.
We now uses reCAPTCHA v2:
- user must check a simple checkbox (No CAPTCHA),
- eventually he must validate a challenge.
Moving keys settings allows to use the captcha for development.
Fixes #192 .
2018-05-14 13:22:59 +02:00
Evarin
6d72644ee3
Clean code up
2018-04-28 15:59:49 +02:00
Martin Pépin
e21666a112
Fix old-style urls (registration)
2018-04-16 16:34:34 +02:00
Ludovic Stephan
f85d51e3bd
Merge branch 'Kerl/drop_py2_compat' into 'master'
...
Suppression des derniers vestiges de la compatibilité python 2
Closes #103
See merge request cof-geek/gestioCOF!278
2018-04-16 15:21:00 +02:00
Martin Pepin
2818e43b2e
Merge branch 'Kerl/readme' into 'master'
...
Recommande l'installation manuelle dans le README
See merge request cof-geek/gestioCOF!298
2018-04-16 14:24:55 +02:00
Martin Pépin
ea737dab29
Merge branch 'Kerl/drop_py2_compat' of git.eleves.ens.fr:cof-geek/gestioCOF into Kerl/drop_py2_compat
2018-04-16 14:18:21 +02:00
Martin Pépin
a73736bf41
Merge branch 'master' into Kerl/drop_py2_compat
2018-04-16 14:12:36 +02:00
Martin Pépin
2faa8d6b65
README: typo, some links, …
2018-04-14 23:11:14 +02:00
Martin Pépin
769f4fc7b8
README: mention the test database and unit tests
2018-04-14 14:15:29 +02:00
Martin Pépin
dd9a81d891
Update install instructions
2018-04-14 14:00:37 +02:00
Ludovic Stephan
fc37c5a8a0
Annulation des reventes
...
- On peut annuler des reventes à tout point du processus
- Le formulaire d'annulation donne plus d'informations
2018-04-13 10:54:45 +02:00
Martin Pépin
6168045c3a
bda: swap double/autoquit descriptions
2018-04-09 22:43:25 +02:00
Martin Pepin
6c983e16e5
Merge branch 'Roussille/bda' into 'master'
...
autorisation des requêtes cross-domain
See merge request cof-geek/gestioCOF!253
2018-04-08 22:43:30 +02:00
Martin Pépin
a7cd1e04cd
prefer CORS_ORIGIN_WHITELIST to CORS_ORIGIN_REGEX_WHITELIST
2018-04-08 22:33:19 +02:00
Martin Pépin
09cfcc476a
Bump django-cors-headers
2018-04-08 22:32:59 +02:00
Martin Pépin
556c354f8a
Merge branch 'master' into Roussille/bda
2018-04-08 22:30:48 +02:00
Martin Pepin
25f4c64835
Merge branch 'Aufinal/bda_fixes' into 'master'
...
Fix pour BdA-Revente
See merge request cof-geek/gestioCOF!263
2018-04-07 14:55:33 +02:00
Martin Pépin
87a6722143
Merge branch 'master' into Aufinal/bda_fixes
2018-04-07 14:46:07 +02:00
Martin Pépin
568a58c52a
Merge branch 'qwann/separate_list'
2018-04-07 14:25:04 +02:00
Martin Pépin
53a4c78903
Remove duplicate line
2018-04-07 14:21:07 +02:00
Martin Pépin
158b19778b
also sort the unsold table
2018-04-07 14:20:41 +02:00
