Commit graph

1019 commits

Author SHA1 Message Date
Hugo Roussille
66dd7848b8 Correction du format de l'URL 2017-04-01 16:48:18 +02:00
Hugo Roussille
6b8001db56 Correction des messages d'erreur et de la gestion des exceptions 2017-04-01 16:34:17 +02:00
Martin Pépin
67b4421933 PEP8 does not like \ 2017-03-31 17:54:31 +01:00
Martin Pépin
8a1af73ee0 A migration for the new field appear_catalogue 2017-03-31 17:53:35 +01:00
Hugo Roussille
8cf14d3f6b Possibilité de filtrer sur plusieurs salles/catégories 2017-03-31 04:33:13 +02:00
Hugo Roussille
73c21d83ee Correction des exceptions et de l'URL des images 2017-03-31 03:47:32 +02:00
Hugo Roussille
f3b9266e35 Simplification du code avec des méthodes de Django 2017-03-31 03:35:09 +02:00
Hugo Roussille
a9c8de7544 Utilisation des JsonResponse 2017-03-31 03:15:40 +02:00
Hugo Roussille
c4a3c1a92a Formatage du code selon PEP-8 2017-03-31 02:51:58 +02:00
Hugo Roussille
a8428f1b41 Précision des tirages qui doivent apparaître dans le catalogue 2017-03-16 06:34:49 +01:00
Hugo Roussille
7ecea0e391 Meilleure gestion des dates et timezones 2017-03-16 06:22:01 +01:00
Hugo Roussille
68334e15d7 Gestion des citations 2017-03-16 05:50:02 +01:00
Hugo Roussille
f64a865de1 Côté serveur du catalogue des spectacles BdA 2017-03-15 07:37:24 +01:00
Martin Pepin
a0a7be43e1 Merge branch 'Aufinal/fix_revente' into 'master'
Répare les boutons de transfert/réinitialisation de revente. Le problème
était dû à une mauvaise conversion `str` -> `int` de l'id de la revente 
et l'utilisation d'un formulaire Django élimine ce problème.

fixes #122

See merge request !172
2017-02-22 14:08:00 +01:00
Ludovic Stephan
42a93027d3 fix pep8 + move template 2017-02-21 19:49:29 -03:00
Ludovic Stephan
d96f4ead87 Revert "remove immediate mail"
This reverts commit 8953d3de07.
2017-02-16 09:55:19 -02:00
Ludovic Stephan
8953d3de07 remove immediate mail 2017-02-16 09:22:15 -02:00
Ludovic Stephan
d524d9286f better annulation check 2017-02-16 02:28:57 -02:00
Ludovic Stephan
d9402e1059 change resell and reinit forms 2017-02-16 01:52:44 -02:00
Martin Pépin
451fddaff0 Fix CI script
Finally, the old test database is destroyed before the build which
is simpler and makes more sense.
2017-02-13 17:43:10 +01:00
Martin Pépin
e8d21882fb Fix CI config
cleanup is not a stage by default, it has to be specified
2017-02-13 17:33:35 +01:00
Martin Pépin
85e593ddb8 Removes the test database if the build fails
Sometime the test database is not destroyed because the build is
interrupted by an uncaught error. This causes an error during the next
build.
2017-02-13 17:27:27 +01:00
Martin Pépin
f5b23174de Fix test_database issue in bootstrap
The test database shouldn't be created manually
2017-02-12 17:39:30 +01:00
Martin Pépin
266a789d97 Merge branch 'Kerl/messages'
- Utilise une version à jour de jquery via un cdn
- Traite les messages
- Remplace les vieux simili-messages par des messages en utilisant le
  framework messages de Django
2017-02-12 16:47:44 +01:00
Martin Pepin
dc822d3c72 Add license 2017-02-11 21:35:29 +01:00
Martin Pépin
427859c2f5 Oublis 2017-02-11 21:33:25 +01:00
Martin Pépin
d41d905366 PEP8 2017-02-11 21:20:51 +01:00
Martin Pépin
313b5cf61d Merge branch 'master' into Aufinal/dev_data_kfet 2017-02-11 21:01:37 +01:00
Martin Pépin
70e89e3737 Merge branch 'master' into Kerl/messages 2017-02-11 20:55:17 +01:00
Martin Pépin
65341f0ecb Minor error 2017-02-11 20:43:49 +01:00
Qwann
5b54d76e36 Merge branch 'Kerl/use_django_custommail' 2017-02-11 16:30:12 +01:00
Qwann
ec7012ee47 Merge branch 'Kerl/use_django_custommail' of git.eleves.ens.fr:cof-geek/gestioCOF into Kerl/use_django_custommail 2017-02-11 16:22:09 +01:00
Qwann
924a289a78 cleaning UGLY django template style
and moving some template files
2017-02-11 16:21:13 +01:00
Martin Pépin
27bf59d4c0 Merge branch 'Kerl/use_django_custommail' of git.eleves.ens.fr:cof-geek/gestioCOF into Kerl/use_django_custommail 2017-02-11 16:16:00 +01:00
Martin Pépin
b4bf437447 Minor fixes 2017-02-11 16:15:17 +01:00
Qwann
5d35112c87 Merge branch 'Kerl/use_django_custommail' of git.eleves.ens.fr:cof-geek/gestioCOF into Kerl/use_django_custommail 2017-02-11 15:34:04 +01:00
Qwann
62dc04c19f cleaning ugly html 2017-02-11 15:33:22 +01:00
Martin Pépin
0e759405c7 Change the migration index 2017-02-11 15:13:29 +01:00
Martin Pépin
675ff99414 Supprime les doublons avec jquery 2017-02-11 11:50:49 +01:00
Martin Pépin
99a19f850a typo 2017-02-11 11:41:49 +01:00
Martin Pépin
71fb020e10 Merge branch 'master' into Kerl/messages 2017-02-11 11:40:47 +01:00
Martin Pépin
6e55905781 Merge branch 'master' into Kerl/use_django_custommail 2017-02-11 03:20:29 +01:00
Qwann
06eafdae47 Merge branch 'master' of git.eleves.ens.fr:cof-geek/gestioCOF 2017-02-11 02:54:54 +01:00
Qwann
5136e394d4 Merge branch 'Kerl/modernize_petitscours' 2017-02-11 02:54:22 +01:00
Qwann
ed01508481 using context_object_name and moving template 2017-02-11 02:51:43 +01:00
Robin Champenois
1060a0a368 Merge branch 'Kerl/ldap' into 'master'
The end of Clipper

GestioCOF fetches the clipper accounts from an LDAP database and doesn't
need to store clippers in a table anymore.

You need to run migrations to apply this patch

The default behaviour is not to fetch data from the LDAP because you may not have access to it.
To test over a ldap database server or in production, you need to set `settings.LDAP_SERVER_URL`
to the correct value.

Fixes #13

See merge request !140
2017-02-11 02:42:00 +01:00
Martin Pépin
02a8e74e3b Optimize code, better queries
- Remove useless Q queries
- Optimize with sets
- Queries over clipper id too
2017-02-11 02:39:59 +01:00
Martin Pépin
d4b696db70 Merge branch 'master' into Kerl/ldap 2017-02-11 01:55:02 +01:00
Martin Pepin
f0774a3e3c Merge branch 'robin' into 'master'
Support des touch-events et clean des deps jquery-ui

Fixes #80

See merge request !167
2017-02-11 00:37:16 +01:00
Evarin
839d60e48f Support tactile jquery-ui 2017-02-11 00:11:14 +01:00