Commit graph

2444 commits

Author SHA1 Message Date
Martin Pepin
94d5e0f0ac Merge branch 'Aufinal/fix_cas_redirect' into 'master'
Fix la redirection lors d'un logout CAS

See merge request klub-dev-ens/gestioCOF!385
2019-11-28 16:08:50 +01:00
Martin Pépin
a521caba8d
Update changelog wrt the lastest merged patches. 2019-11-28 14:53:44 +01:00
Martin Pepin
797f0356f6 Merge branch 'Aufinal/no_reduction_category' into 'master'
Permet d'exclure des catégories de la réduction COF

See merge request klub-dev-ens/gestioCOF!386
2019-11-28 14:30:54 +01:00
Martin Pépin
8dcc1f012a
Update CHANGELOG 2019-11-28 14:17:59 +01:00
Ludovic Stephan
1115960107 Add unit test 2019-11-27 16:57:48 +01:00
Ludovic Stephan
727b3042a1 Merge branch 'kerl/fix-multiple-select-urls' into 'master'
Mise à jour de certaines urls (multiple-select.{css,js})

See merge request klub-dev-ens/gestioCOF!387
2019-11-27 16:09:13 +01:00
Martin Pépin
61efded673
Remove unused references to multiple-select.* 2019-11-27 15:46:50 +01:00
Ludovic Stephan
38aecdd741 Typo 2019-11-27 14:41:20 +01:00
Martin Pépin
e0ffee295d
Fix static urls for multiple-select 2019-11-27 14:30:24 +01:00
Ludovic Stephan
e62756ed29 Fix tests 2019-11-27 14:20:24 +01:00
Ludovic Stephan
ac3bfbe368 Display in kfet js 2019-11-27 14:14:42 +01:00
Ludovic Stephan
affdf43e0b Add logic in views and templates 2019-11-27 14:14:33 +01:00
Ludovic Stephan
20ceec0e64 Add has_reduction property 2019-11-27 14:11:53 +01:00
Ludovic Stephan
4c9ee8a57d Merge branch 'fix-cash-transaction-cancel' into 'master'
Fix typo and hence cash transaction cancel

Closes #239

See merge request klub-dev-ens/gestioCOF!384
2019-11-27 13:32:23 +01:00
Ludovic Stephan
5c581d8984 Cleanup + no msg on CAS logout 2019-11-27 13:14:20 +01:00
Ludovic Stephan
ac4d5cf7d5 Patch CAS redirect parameter in logout view 2019-11-27 13:03:28 +01:00
Antonin Reitz
b90e749a7f Fix typo and hence cash transaction cancel 2019-11-27 10:50:27 +01:00
Ludovic Stephan
d04b79bcb5 Disable autoescape in js code 2019-11-25 10:48:43 +01:00
Ludovic Stephan
14164ec4a5 Merge branch 'kerl/fix-wagtail-deps' into 'master'
Règle un problème de dépendances de wagtailmenus avec python 3.8

See merge request klub-dev-ens/gestioCOF!381
2019-11-25 10:26:06 +01:00
Martin Pépin
f9b461a08d
Bump django-redis-cache to version 2.1.* 2019-11-22 22:45:27 +08:00
Martin Pépin
8c5d09dbee
Bump wagtail to version 2.7 (LTS) 2019-11-22 22:35:23 +08:00
Martin Pépin
e2af45929e
Use the production requirements in CI 2019-11-22 22:22:47 +08:00
Martin Pépin
481cb5e478
Move production deps out of requirements.txt 2019-11-22 22:18:04 +08:00
Martin Pépin
a3ca2e66bf
Fix some dependency issue with wagtail 2019-11-22 22:18:04 +08:00
Martin Pepin
82746f1492 Merge branch 'Aufinal/fix_privilege_escalation' into 'master'
Fix le problème d'auth par mdp K-Fêt

Closes #240

See merge request klub-dev-ens/gestioCOF!380
2019-11-22 14:37:13 +01:00
Ludovic Stephan
ea45eb1f55 Fix tests 2019-11-21 01:21:26 +01:00
Ludovic Stephan
a60df91b04 Add decorator to needed views 2019-11-21 01:21:26 +01:00
Ludovic Stephan
c1a99453d5 Add password auth decorator 2019-11-21 01:21:26 +01:00
Ludovic Stephan
be5218f7e1 Remove pesky middleware 2019-11-21 01:21:26 +01:00
Ludovic Stephan
dd5fe36ee1 Fix requirements problem 2019-11-21 01:21:26 +01:00
Ludovic Stephan
4a4dae9951 Merge branch 'kerl/clubs' into 'master'
Nouvelle app: clubs

See merge request klub-dev-ens/gestioCOF!372
2019-11-06 19:22:58 +01:00
Martin Pépin
5d87d7f249
Update CHANGELOG; version 0.3.2 2019-11-04 15:41:40 +01:00
Martin Pepin
f9cde30e08 Merge branch 'Aufinal/fix_missing_names' into 'master'
Fix le problème des prénoms manquants

See merge request klub-dev-ens/gestioCOF!378
2019-11-04 15:39:35 +01:00
Ludovic Stephan
b376114bee Fix tests 2019-11-03 00:36:57 +01:00
Ludovic Stephan
57088cda03 Fix le problème des prénoms manquants
Depuis !360, quand on modifie son propre compte K-Fêt, cela supprime les
noms associés sur gestioCOF... Le problème est réglé, normalement.
2019-11-03 00:02:34 +01:00
Ludovic Stephan
b542f805f0 Merge branch 'kerl/empty_banner' into 'master'
Pour supprimer, la bannière "d'annonces" en haut de GestioCOF…

See merge request klub-dev-ens/gestioCOF!377
2019-10-21 16:28:20 +02:00
Martin Pépin
28a129f69c
Allows empty announcement banners 2019-10-19 21:17:13 +02:00
Martin Pépin
c4f5e168f2
Update CHANGELOG for v0.3.1 2019-10-19 21:00:44 +02:00
Martin Pepin
5b2dad6fff Merge branch 'Aufinal/fix-accounts' into 'master'
Fix account history

See merge request klub-dev-ens/gestioCOF!376
2019-10-19 20:59:39 +02:00
Ludovic Stephan
b22a77e603 Fix account history 2019-10-19 10:33:15 +02:00
Martin Pepin
4d9c66cb51 Merge branch 'Aufinal/fix-reventes' into 'master'
Fix: Souscription aux reventes

See merge request klub-dev-ens/gestioCOF!375
2019-10-18 09:31:56 +02:00
Ludovic Stephan
9254e3f8f7 Fix: Souscription aux reventes
Il me semblait que c'était déjà fait...
2019-10-17 10:50:54 +02:00
Martin Pepin
635c14ff8f Merge branch 'Aufinal/staticfiles' into 'master'
Réorganise les fichiers statiques de GestioCOF

See merge request klub-dev-ens/gestioCOF!352
2019-10-16 21:24:31 +02:00
Ludovic Stephan
898abd15c6 Ignore /src directories 2019-10-16 20:51:10 +02:00
Ludovic Stephan
337453c6c6 Add source for bootstrap-datetimepicker 2019-10-16 20:50:59 +02:00
Ludovic Stephan
bdb8f06e1d Déplace bda.css et supprime une police
On met le static de `bda` dans `static/bda`, comme tout le monde.
2019-10-16 20:27:57 +02:00
Ludovic Stephan
64b4c2c08a Revert "Ignore src/ directories"
On ignorera ça proprement en Django 2.2...
2019-10-16 20:27:57 +02:00
Ludovic Stephan
8a6a3d0994 Ignore src/ directories 2019-10-16 20:27:57 +02:00
Ludovic Stephan
8ea0cb84d1 Move source files (not minified) to src/ directory 2019-10-16 20:27:57 +02:00
Ludovic Stephan
099857e226 Supprime une police inutilisée 2019-10-16 20:27:57 +02:00