Ludovic Stephan
55c1d7f02c
Refactor templates
2019-01-07 22:51:02 +01:00
Ludovic Stephan
71cae7f5ca
Remove dead code
2019-01-07 22:50:30 +01:00
Ludovic Stephan
445745ee15
Merge branch 'master' into Aufinal/prettify-revente
...
Merge remote-tracking branch 'origin/master' into Aufinal/prettify-revente
2019-01-07 22:34:28 +01:00
Ludovic Stephan
47c02d72af
Réorganisation de bda/forms
...
Suppression de code mort, tri des formulaires
Remove bootstrap forms loading
2019-01-07 16:43:46 +01:00
Ludovic Stephan
ae0abb5cb3
Better JS for tables
2019-01-07 16:28:52 +01:00
Ludovic Stephan
f66a54bb73
Prettify revente/manage
2019-01-07 16:24:30 +01:00
Ludovic Stephan
010ce0df3e
Bugfixes : add staticfiles and typo
2019-01-07 15:27:41 +01:00
Ludovic Stephan
519ef9dc20
Fix concurrency issues
...
Creating form fields in the class and modifiying them dynamically can
cause concurrency issues because the form class is shared between tabs.
2019-01-07 14:59:20 +01:00
Ludovic Stephan
a30955fb75
HTML corrections ; stupidtable injection
2019-01-07 14:58:31 +01:00
Ludovic Stephan
66104e1137
Black
2018-12-08 10:41:46 +01:00
Ludovic Stephan
15ab316909
Merge branch 'master' into Aufinal/prettify-revente
2018-12-08 10:40:10 +01:00
Ludovic Stephan
6be42d57ca
Prettify revente/shotgun
2018-12-07 17:35:53 +01:00
Ludovic Stephan
5c8164dd3b
Prettify revente/tirages
2018-12-07 17:35:40 +01:00
Ludovic Stephan
625825cf3f
Améliore TemplateLabelField
...
- Rajouter une option pour `option_template_name` et `context_object_name` dans la classe, et documente mieux. Répercute ces changements dans `InscriptionReventeForm`.
2018-12-07 17:33:17 +01:00
Ludovic Stephan
dbd017f680
Prettify revente/subscribe
2018-11-21 19:47:20 +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
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
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
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
aac9b41442
bda.tests -- Silence syncmails in setup
2018-10-06 17:39:52 +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
6858df02be
bda.tests -- Use urllib urlencode
2018-09-30 13:22:22 +02:00
Aurélien Delobelle
3eb939928f
Merge branch 'master' into Kerl/tests
2018-09-30 13:08:58 +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 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 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
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 Pépin
87a6722143
Merge branch 'master' into Aufinal/bda_fixes
2018-04-07 14:46:07 +02:00
Martin Pépin
623047dca2
Fix old-style reversal of calendar urls
2018-04-06 11:11:02 +02:00
Martin Pepin
307c48ca76
Merge branch 'elarnon/fix-182' into 'master'
...
Properly propagate the default number of places in tirage
Closes #182
See merge request cof-geek/gestioCOF!295
2018-02-20 14:40:20 +01:00
Basile Clement
6ecc9a54b3
Properly propagate the default number of places in tirage
...
Fixes #182 .
2018-02-11 19:24:01 +01:00
Basile Clement
3314670cab
Various fixes for Django 1.11
...
- The {% cycle %} command was used non-quoted arguments separated by
commas, while it is supposed to use quoted arguments separated by
spaces (I'm actually not sure how that ever worked :)
- django-bootstrap-form was at version 3.2.1 which is not compatible
with Django 1.11 (but also required by GestioCOF). I upgraded it to
version 3.3.
2018-02-11 19:09:07 +01:00
Martin Pépin
d57c75d2a0
Minor simplificatons after code review
2018-02-05 22:36:08 +01:00
Aurélien Delobelle
42e762bc4a
Py3 allows to shorten super()
2018-01-16 16:50:27 +01:00
Martin Pépin
79fccc136a
Merge branch 'master' into Kerl/tests
2018-01-10 20:21:38 +01:00
Ludovic Stephan
52fd49616d
Fix model test
2018-01-10 20:14:27 +01:00
Martin Pépin
5a5b60ec4d
Merge branch 'master' into Kerl/drop_py2_compat
2018-01-10 20:12:59 +01:00
Ludovic Stephan
501d592d2f
Merge branch 'master' into Aufinal/bda_fixes
2018-01-10 20:00:34 +01:00
Martin Pepin
771b642a98
Merge branch 'aureplop/revente-reply_to' into 'master'
...
bda -- Set winner's email as Reply-to of the email…
Closes #179
See merge request !276
2018-01-07 16:03:20 +01:00
