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
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
Aurélien Delobelle
42e762bc4a
Py3 allows to shorten super()
2018-01-16 16:50:27 +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
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
Ludovic Stephan
6a6549e0d7
Add notif time
...
In case of a gestioCOF bug, we keep the notification time in memory to
still do the drawing 1-3 days after.
2017-10-23 20:55:01 +02:00
Ludovic Stephan
684603709e
Class attributes and properties + more verbose log
...
SpectacleRevente gets brand new properties and attributes to simplify
code ; also, manage_reventes command output is more verbose
2017-10-23 20:30:34 +02:00
Ludovic Stephan
919bcd197d
Small code QoL improvements
2017-10-23 18:59:30 +02:00
Ludovic Stephan
e74dbb11f1
Organize revente files and function names
2017-10-23 18:39:45 +02:00
Ludovic Stephan
732e47707e
Add unsubscribe option + list of current draws
2017-10-23 17:25:58 +02:00
Aurélien Delobelle
46187659ed
Fix tirage pk conflicts with postgres
2017-10-17 14:42:39 +02:00
Martin Pépin
b73faa3b84
Merge branch 'master' into Production
2017-09-25 18:40:00 +02:00
Aurélien Delobelle
d18fb86a98
Fix attribution inlines of participant in admin
2017-09-25 18:26:54 +02:00
Martin Pépin
db512a97f6
In /admin: displays "given" when it's relevant
2017-09-25 14:22:46 +02:00
Martin Pépin
d89ba1efe5
Fix catalogue behaviour if id=0
2017-09-20 18:21:59 +02:00
Martin Pépin
80f6a808dc
Simplify the mails-rappel view
2017-06-18 17:03:50 +01:00
Martin Pépin
69aee6b8ac
Move bda.get_generic_user + optimize send_rappels
2017-06-18 16:52:53 +01:00
Martin Pépin
5c11893059
Add a link to the "bda-rappel" mail edition page
2017-06-02 19:33:23 +01:00
Martin Pépin
4fce1e8afc
typo
2017-06-02 19:14:10 +01:00
Martin Pépin
ffb777a4cd
Test the "participants" views
2017-06-02 19:14:10 +01:00
Martin Pépin
76c75d5ccd
Move bda-participant template -> bda/ folder
2017-06-02 19:14:10 +01:00
Martin Pépin
fbdfdeef46
Add a link to the reminder emails sending page
2017-06-02 19:14:09 +01:00
Martin Pépin
31c034a96a
send_rappel: use django messages + css tweaks
2017-06-02 19:14:06 +01:00
Martin Pépin
2a3614540f
minor PEP8 changes
2017-06-02 17:32:23 +01:00
Martin Pépin
0e03fc85ee
The BdA receives the reminder emails
2017-06-02 17:25:04 +01:00
