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
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
Martin Pépin
5086128f16
Fix ill-formed url in tests
2018-01-07 14:45:04 +01:00
Martin Pépin
c80e63415b
Load custommails before bda tests
2018-01-07 14:30:33 +01:00
Martin Pépin
e9b901337e
A few tests for BdA views
2018-01-07 13:35:23 +01:00
Martin Pépin
57411ab46f
Remove __future__ imports
2018-01-06 16:10:13 +01:00
Martin Pépin
475f1adec5
Remove "coding: utf8" line
2018-01-06 16:10:13 +01:00
Ludovic Stephan
9a8773978c
Use new method in admin
2017-12-19 12:50:20 +01:00
Ludovic Stephan
1783196a9c
Management view only deals with Revente objects
...
Except for Revente creation, every form is now handled with revente
objects, to use the display option in the previous commit.
2017-12-19 12:41:50 +01:00
Ludovic Stephan
f1bbade002
Better labels for revente objects
...
The label for the ReventeModelMultipleChoiceField now depends on a
`own` parameter, which determines if we display the seller or the
buyer's name.
2017-12-19 12:40:50 +01:00
Ludovic Stephan
dfa8c1a1a1
Merge branch 'Aufinal/bda_fixes' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/bda_fixes
2017-12-19 11:54:07 +01:00
Ludovic Stephan
212528011a
Add some tests
2017-12-19 11:40:02 +01:00
Aurélien Delobelle
241c77e3b4
bda -- Set winner's email as Reply-to of the email…
...
…sent to the seller when a resale has been assigned.
Fixes #179 .
2017-11-24 06:58:33 +01:00
Aurélien Delobelle
b0b0542407
Upgrade to Django 1.11
...
- Deprecation warnings using Django 1.8 are resolved.
- Deprecation warnings using Django 1.11 are resolved.
- Admin: grappelli is no longer used.
- Upgrade to django-autocomplete-light v3 (v2 is not 1.11 compatible).
* autocomplete.modelform_factory being dropped, code uses dal Select2
views and widgets.
2017-11-19 18:41:39 +01:00
Martin Pépin
91bdf11852
Coding style: python's scope sucks
2017-11-01 17:29:38 +01:00
Martin Pépin
f18959c0a1
BdA-Revente: meaningful names, some help tests
2017-11-01 17:26:40 +01:00
Martin Pépin
e1794a654f
Merge branch 'master' into Aufinal/bda_fixes
2017-11-01 11:25:52 +01:00
Martin Pépin
273e6374ef
Pluralization in bda -> participant list
2017-11-01 11:09:35 +01:00
Ludovic Stephan
785555c05c
Misc fixes
2017-10-26 12:40:11 +02:00
Aurélien Delobelle
8cdb4c62fc
Merge branch 'master' into test/views
2017-10-24 16:45:26 +02:00
