cst1/kpsul
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity
1611 commits 38 branches 17 tags 11 MiB
Commit graph

1611 commits

This branch
This branch
All branches
Author SHA1 Message Date
Martin Pépin 741f0183e6 Prevent ldap injections in autocompletion views 
We only allow alphanumeric characters in the query in order to avoid
injections
 2017-03-16 22:43:43 +00: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
Ludovic Stephan 3793863bab Merge remote-tracking branch 'origin/k-fet' into Aufinal/merge_k-fet 2017-03-15 22:58:54 -03:00
Martin Pépin 3acc8bca75 s/username/clipper in highlight_clipper 
There was typo, the `Clipper` object has no `username` attribute. We
want to use the `clipper` attribute
 2017-03-15 19:11:38 +00:00
Martin Pépin e98a407982 Rename bits -> search_words in kfet.autocomplete 
This is typo, this variable has not the same name in
`gestioncof.autocomplete` and `kfet.autocomplete`
 2017-03-15 19:02:31 +00:00
Martin Pépin 84a39b41f2 Fix wrong email generation in _traitement_post (2) 
I forgot to fix an email in commit c51379447. Now there are all
well-formed
 2017-03-15 18:35:42 +00:00
Martin Pépin c4edff717d Disable the fail_silently option for emails 
It is obviously a bad idea to fail silently if something go wrong
when the connection with the mail server is being established. This was
enabled in the `_traitement_post` method.
 2017-03-15 18:21:26 +00:00
Martin Pépin c513794474 Fix wrong email generation in _traitement_post 
The list `proposed_mails` is a list of elements of the kind
`(User, (mail_object, mail_body))` but it was handled as if it were
`(User, mail_body)` in the function `_traitement_post`.
 2017-03-15 18:17:08 +00:00
Martin Pépin 98abe71681 Handle errors=None in _finalize_traitement 
Sometimes the `errors` variable is `None` in `_finalize_traitement`.
It was not an issue when it was just used in the templates but now we
have to handle this in the view. Basically, we shall consider it is an
empty list when it occurs.
 2017-03-15 11:59:41 +00:00
Martin Pépin c37754376b Move registration_form to gestioncof/ 
The `registration` view was referencing this file using
`"gestioncof/registration_form.html"` whereas the `registration_post`
templated was referencing it in the global namespace
`"registration_form.html"`.

We choose the `gestioncof/` folder in order to avoid further conflicts
with other apps.
 2017-03-15 11:40:52 +00:00
Hugo Roussille f64a865de1 Côté serveur du catalogue des spectacles BdA 2017-03-15 07:37:24 +01:00
Qwann d0938dfae7 Merge branch 'k-fet' into qwann/k-fet/category_addcost 2017-03-11 15:10:04 +01:00
Aurélien Delobelle e6f0369874 Merge branch 'qwann/k-fet/home' into 'k-fet' 
Qwann/k fet/home

### new features
Adding the menu on the K-Fêt home page.  Adding `hidden` attribute to Article for articles people don't want to have on the menu. The menu only show items with `is_sold = True` and `hidden = True`. 


See merge request !164
 2017-03-11 13:26:56 +01:00
Qwann b0643c0928 typo 2017-03-11 02:04:30 +01:00
Qwann ee6de35627 category addcost added 2017-03-10 18:29:15 +01:00
Qwann 52dda7be9a Merge branch 'qwann/k-fet/home' into qwann/k-fet/kfet_open 2017-03-10 16:58:46 +01:00
Qwann 5ddcd2f1ff Merge branch 'k-fet' into qwann/k-fet/home 2017-03-10 16:58:10 +01:00
Qwann cd31c55254 permission working 2017-03-10 16:40:36 +01:00
Qwann f18bb9f336 permission added 2017-03-09 17:27:58 +01:00
Qwann 8e7b9e2fd3 force close working 2017-03-09 15:05:47 +01:00
Qwann 5694e4b9bc migrations merged 2017-03-09 11:11:31 +01:00
Qwann ce96bc4b67 Status added on home page 2017-03-07 17:31:43 +01:00
Qwann f8e09cf257 unknow status updated every 30s 2017-03-07 14:12:23 +01:00
Qwann 0f96d3bc46 moving kfet_open url 2017-03-07 14:02:08 +01:00
Qwann 392338eddd indent 2017-03-06 09:30:58 +01:00
Qwann b7040d5867 adding KFET_FORCE_CLOSE in cache 2017-03-06 02:25:18 +01:00
Qwann 8e462134c7 home base html 2017-03-06 02:08:33 +01:00
Qwann 964dd716c6 Merge branch 'qwann/k-fet/home' into qwann/k-fet/kfet_open 2017-03-06 02:04:11 +01:00
Qwann ca17e36b5a clean display for is_sold 2017-03-06 02:03:19 +01:00
Qwann dcc19bd9e8 article.hidden in article & article_read 2017-03-06 01:58:33 +01:00
Aurélien Delobelle fbd0d760b6 Merge branch 'Aufinal/command_interface' into 'k-fet' 
Interfaces de commandes et d'inventaires
- Modifie la présentation de ces interfaces.
- Ajout de tooltips d'aide sur les colonnes.

fixes #140 

See merge request !170
 2017-03-06 01:40:40 +01:00
Ludovic Stephan 8e31fae340 last tweaks 2017-03-05 21:29:20 -03:00
Ludovic Stephan 61e2fedb08 Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/command_interface 2017-03-05 21:12:53 -03:00
Qwann 624707570e Merge branch 'qwann/k-fet/home' into qwann/k-fet/kfet_open 2017-03-05 20:06:37 +01:00
Qwann 197da29366 css include added... 2017-03-05 20:05:35 +01:00
Qwann 15b8900d43 fixes dumb merge 2017-03-05 19:56:56 +01:00
Qwann a828ecbcf0 Merge branch 'qwann/k-fet/home' into qwann/k-fet/kfet_open 2017-03-05 19:51:51 +01:00
Qwann b0b2210e93 Merge branch 'qwann/k-fet/home' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/k-fet/home 2017-03-05 19:44:08 +01:00
Qwann 9f94262b82 removing inapropriate message 2017-03-05 19:43:26 +01:00
Qwann f52aba8ca6 Merge branch 'k-fet' into qwann/k-fet/home 2017-03-05 19:21:20 +01:00
Aurélien Delobelle 95b129e396 resolved merge conflict in kfet views imports 2017-02-25 02:00:56 +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
Evarin ddbcfe0c69 JS commenté et plus propre 2017-02-15 22:25:26 +01:00