cst1/kpsul
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity
1932 commits 38 branches 17 tags 11 MiB
Commit graph

1932 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ludovic Stephan 27d26245a5 Bugfix : deep extend in history.js 2018-10-05 22:59:55 +02:00
Ludovic Stephan 7e15fd2d9e Fix CheckoutReadView test 2018-07-18 16:37:41 +02:00
Ludovic Stephan a0bd437250 Merge branch 'master' into aureplop/kpsul_js_refactor 2018-07-18 15:02:19 +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
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
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
Martin Pépin 6d0ec6de43 Merge branch 'master' into qwann/separate_list 2018-04-07 14:09:48 +02:00
Martin Pepin 9d7486585b Merge branch 'aureplop/kfet-sticky_thead' into 'master' 
kfet -- Tables are sortable

Closes #171

See merge request cof-geek/gestioCOF!277
 2018-04-07 13:47:55 +02:00
Martin Pépin 71b4e6253d Merge branch 'master' into aureplop/cof-tests_calendar 2018-04-07 13:42:19 +02:00
Martin Pépin fba105fdd1 Merge branch 'master' into aureplop/kfet-sticky_thead 2018-04-07 13:32:20 +02:00
Martin Pepin 3463017d59 build status in README.me 2018-04-07 12:54:50 +02:00
Martin Pepin 9986cb1dc7 Merge branch 'aureplop/cof-tests_misc' into 'master' 
cof -- Add tests for some views

See merge request cof-geek/gestioCOF!292
 2018-04-07 12:46:25 +02:00
Martin Pépin 71a61fe31d Merge branch 'master' into aureplop/cof-tests_misc 2018-04-07 12:41:42 +02:00
Martin Pepin 0cceed9052 Merge branch 'aureplop/cof-tests_export' into 'master' 
cof -- Add tests for export views

See merge request cof-geek/gestioCOF!291
 2018-04-07 12:15:06 +02:00
Martin Pépin 6328cdaa19 Tests: the order of our csv files is not relevant 2018-04-07 12:05:16 +02:00
Martin Pépin ee33762845 Merge branch 'master' into aureplop/cof-tests_export 2018-04-07 11:24:05 +02:00
Martin Pepin 2d14296c47 Merge branch 'aureplop/cof-tests_club' into 'master' 
cof -- Add tests for club views

See merge request cof-geek/gestioCOF!289
 2018-04-07 10:54:31 +02:00
Martin Pépin 660f395b67 Merge branch 'master' into aureplop/cof-tests_club 2018-04-07 10:49:52 +02:00
Martin Pepin f23d351ddc Merge branch 'aureplop/cof-tests_calendar' into 'master' 
cof -- Add tests for calendar views

See merge request cof-geek/gestioCOF!290
 2018-04-07 10:33:35 +02:00
Martin Pépin 60d8e76fee Merge branch 'master' into aureplop/cof-tests_calendar 2018-04-07 10:24:41 +02:00
Martin Pépin 623047dca2 Fix old-style reversal of calendar urls 2018-04-06 11:11:02 +02:00