Commit graph

2627 commits

Author SHA1 Message Date
Basile Clement
a2116bf290 Merge branch 'master' into aureplop/cof-tests_petitcours 2018-11-25 00:22:16 +01:00
Basile Clement
d48cb3aaed petitcours.tests -- Deplace les tests dans leur propre fichier 2018-11-25 00:22:12 +01:00
Ludovic Stephan
dbd017f680 Prettify revente/subscribe 2018-11-21 19:47:20 +01:00
Martin Pépin
712588af7d Merge branch 'master' into evarin/site-cof 2018-11-19 23:30:33 +01:00
Robin Champenois
6524f89ebd Merge branch 'Elarnon/bda_tirage_message_d_erreur_quand_il_y_a_une_erreur' into 'master'
Affiche un message d'erreur lors de l'enregistrement des voeux BDA

See merge request klub-dev-ens/gestioCOF!330
2018-11-12 23:22:38 +01:00
Basile Clement
7f2f25cb71 Isort 2018-11-12 23:04:37 +01:00
Basile Clement
042ce80b78 Run black 2018-11-12 22:52:20 +01:00
Basile Clement
d7f4d32c92 Oh mon dieu! 2018-11-12 22:46:02 +01:00
Basile Clement
b80927efa3 Message d'erreur qui ne parle pas de object Voeu 2018-11-12 22:44:09 +01:00
Basile Clement
511981e762 Simplifie la Logique 2018-11-12 22:22:49 +01:00
Basile Clement
e09fa2b847 Affiche un message d'erreur lors de l'enregistrement des voeux BDA
Voir #203
2018-11-12 22:16:43 +01:00
Robin Champenois
39d82a573f Merge branch 'Elarnon/autoriser_la_suppression_dun_voeud_bda_qui_nexiste_pas' into 'master'
Permet la suppression d'un voeu ajouté mais non enregistré

See merge request klub-dev-ens/gestioCOF!329
2018-11-12 22:03:07 +01:00
Basile Clement
7124821f7c Permet la suppression d'un voeu ajouté mais non enregistré
Voir #203.  Cette solution est horrible, tout comme le code dans
lequel elle se trouve.  Déso pas déso.
2018-11-12 21:56:40 +01:00
Ludovic Stephan
ba21de683b Merge branch 'Elarnon/cas_v3_v2' into 'master'
Fix CAS support in python-cas 1.3+

See merge request klub-dev-ens/gestioCOF!328
2018-11-12 21:09:14 +01:00
Basile Clement
00a1e79af6 Fix CAS support in python-cas 1.3+
cas.eleves.ens.fr has /serviceValidate, not /p3/serviceValidate, and is
thus *probably* a V2 CAS server.  python-cas was broken and using
/serviceValidate for V3 while it should have been /p3/serviceValidate,
see
c3ac4b6c76
2018-11-12 00:54:44 +01:00
Ludovic Stephan
95ba7798d7 Ignore VSCode files 2018-11-04 23:07:57 +01:00
Aurélien Delobelle
0fe63d3eae petitcours.tests -- Add tests for demande (raw) views 2018-10-27 22:29:55 +02:00
Aurélien Delobelle
3d27dc9a41 petitcours.tests -- Add tests for inscription and (re)traitement views 2018-10-27 19:18:58 +02:00
Aurélien Delobelle
1a5bbf32a4 petitcours.tests -- Add tests for demandes list and details views 2018-10-27 19:18:58 +02:00
Aurélien Delobelle
25dfe2f496 petitcours.tests -- Add PCAbility, PCDemande and PCSubject factories 2018-10-27 19:18:58 +02:00
Aurélien Delobelle
8be913cbf9 style -- black 2018-10-27 13:37:39 +02:00
Aurélien Delobelle
49a74e8e1e Merge branch 'Kerl/syncmails' into 'master'
Utilisation de la command `syncmails` du package custommail

See merge request cof-geek/gestioCOF!323
2018-10-21 14:22:59 +02:00
Aurélien Delobelle
b69f1b6dbc kfet.tests -- Add tests for cancel_operations view 2018-10-21 13:07:44 +02:00
Aurélien Delobelle
d7ca072af3 kfet.tests -- Add factories for many kfet models
- Article
- ArticleCategory
- Checkout
- CheckoutStatement
- Inventory
- InventoryArticle
- Operation
- OperationGroup
2018-10-21 12:50:09 +02:00
Aurélien Delobelle
928abc5a06 core -- Bump version django-djconfig to 0.8.0
Bump djcondig to last version.

Previously used version was failing on some updates, e.g:
kfet_config.set(cancel_duration=timedelta(minutes=15))
2018-10-21 12:50:09 +02:00
Aurélien Delobelle
0ba7100110 Merge branch 'aureplop/ci-move-services' into 'master'
core.ci -- Fix CI (postgres version) + speed up job "linters"

See merge request cof-geek/gestioCOF!324
2018-10-21 12:49:25 +02:00
Aurélien Delobelle
b795a06b9c core.ci -- Use postgres version of production server 2018-10-21 12:33:58 +02:00
Aurélien Delobelle
e478beee5c core.ci -- Narrow services to jobs that need them 2018-10-21 12:33:54 +02:00
Evarin
128a9e32c0 I18n des menus 2018-10-14 16:29:26 +02:00
Evarin
1e3850bb6b Nettoyage dates et calendrier 2018-10-14 15:50:55 +02:00
Martin Pepin
7f5a442bae Merge branch 'Aufinal/annul_reventes' into 'master'
Annulation des reventes

Closes #191

See merge request cof-geek/gestioCOF!297
2018-10-07 12:16:07 +02:00
Martin Pépin
9da9649a45 Use the syncmail command as defined in custommail 2018-10-07 00:55:54 +02:00
Martin Pépin
1f350d60dd Merge branch 'master' into Aufinal/annul_reventes 2018-10-07 00:34:36 +02:00
Aurélien Delobelle
26b19685b8 Merge branch 'Kerl/fix-pre-commit' into 'master'
Autre idée pour réparer le hook de pre-commit

See merge request cof-geek/gestioCOF!322
2018-10-07 00:09:13 +02:00
Martin Pépin
2c0ab1e55e use xargs to prevent globbing in pre-commit.sh 2018-10-07 00:06:51 +02:00
Martin Pepin
b86f3113ea Merge branch 'aureplop/bda-test_silence' into 'master'
bda.tests -- Silence syncmails in setup

See merge request cof-geek/gestioCOF!320
2018-10-06 17:47:54 +02:00
Aurélien Delobelle
aac9b41442 bda.tests -- Silence syncmails in setup 2018-10-06 17:39:52 +02:00
Martin Pepin
ec287c8a3b Merge branch 'aureplop/linters' into 'master'
core -- Add and apply black, flake8, isort to CI and pre-commit

Closes #200

See merge request cof-geek/gestioCOF!317
2018-10-06 16:10:33 +02:00
Aurélien Delobelle
fc4b852bde Merge branch 'Kerl/linters' into 'aureplop/linters'
Script de pre-commit plus robuste

See merge request cof-geek/gestioCOF!319
2018-10-06 16:04:36 +02:00
Martin Pépin
9bc3355a21 pre-commit hook: fix shellcheck's SC2086 & SC2181 2018-10-06 15:50:49 +02:00
Martin Pépin
61fbf0bc80 typo 2018-10-06 15:45:32 +02:00
Aurélien Delobelle
402b544393 core -- Fix flake8 errors 2018-10-06 13:15:33 +02:00
Aurélien Delobelle
fdd2b35289 core -- Apply black + isort to all files 2018-10-06 13:15:33 +02:00
Aurélien Delobelle
104e71dcf6 core -- Add black,isort,flake8 to CI and pre-commit hook
On CI:
- black and isort in check mode must pass.
- flake8 only prints errors
  WIP: make it also failed.

On pre-commit:
- black and isort will format staged files, if installed on path.
- flake8 prints its output if necessary.
2018-10-06 12:53:50 +02:00
Aurélien Delobelle
b23810917d core -- Remove not working cache of py installed packages...
... and use env var for pip install location.
2018-10-06 11:54:18 +02:00
Martin Pepin
b39b6d6bb3 Merge branch 'aureplop/cof-tests_registration' into 'master'
cof -- Add tests for registration views

See merge request cof-geek/gestioCOF!287
2018-10-06 11:25:44 +02:00
Aurélien Delobelle
dda803b7d5 Merge branch 'aureplop/ci-disable-coverage-in-gitlab' into 'master'
core -- Disable coverage in GitLab CI

See merge request cof-geek/gestioCOF!318
2018-10-06 10:14:35 +02:00
Aurélien Delobelle
cc4e3223b6 core -- Disable coverage in GitLab CI 2018-10-05 23:36:59 +02:00
Martin Pepin
39abfceb76 Merge branch 'aureplop/kfet-tests_perform_operations' into 'master'
kfet.tests -- Add tests for perform_operations view + small things

See merge request cof-geek/gestioCOF!313
2018-10-04 23:59:30 +02:00
Martin Pepin
56d979bb47 Merge branch 'aureplop/add-codecoverage-to-ci' into 'master'
core -- Add code coverage to CI

See merge request cof-geek/gestioCOF!314
2018-10-04 19:06:57 +02:00