Commit graph

1370 commits

Author SHA1 Message Date
Aurélien Delobelle
6afbcb44a1 delete array comprehesion 2017-03-25 10:26:45 +01:00
Aurélien Delobelle
967748ded3 details link to read instead of update
- It was the old behaviour.
2017-03-25 09:58:20 +01:00
Aurélien Delobelle
72970c6be7 Fix api call on new transfers
- Use django-js-reverse
- Replace old url (deleted) with standard url
2017-03-25 09:44:55 +01:00
Ludovic Stephan
aa6a50a6e7 Simplify JS-Python interface for cancel_ops 2017-03-24 23:57:27 -03:00
Ludovic Stephan
794527772f Add more explicit migration name 2017-03-24 23:41:33 -03:00
Ludovic Stephan
5f3f044084 Add revert function to migration 2017-03-24 23:27:55 -03:00
Ludovic Stephan
608e67fe6a Add RunPython script to migration 2017-03-24 21:23:04 -03:00
Ludovic Stephan
44fbc92893 Merge branch 'master' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/editions 2017-03-24 21:07:32 -03:00
Ludovic Stephan
d7740e66fe adapt code to is_checkout removal 2017-03-24 20:52:49 -03:00
Ludovic Stephan
cadaf43131 Remove is_checkout field from Operation model 2017-03-24 18:50:57 -03:00
Aurélien Delobelle
ac18cbd9d9 fix by on last statement 2017-03-24 22:10:34 +01:00
Aurélien Delobelle
0d02d47d33 move utils functions 2017-03-24 22:05:04 +01:00
Aurélien Delobelle
2e3bd5bd7a fix search box 2017-03-24 21:41:34 +01:00
Aurélien Delobelle
abce961d91 use django-js-reverse 2017-03-24 21:28:33 +01:00
Aurélien Delobelle
a9d1a6aae9 clean array iteration 2017-03-24 21:24:06 +01:00
Aurélien Delobelle
f063c3470c Merge branch 'Aufinal/fix_password_freeze' into 'master'
K-Psul:
- fix freeze when no-team password

Closes #153

See merge request !196
2017-03-24 20:53:44 +01:00
Aurélien Delobelle
ff5959638b fix missing bracket 2017-03-24 20:32:04 +01:00
Aurélien Delobelle
a221d7841c Merge branch 'Aufinal/merge_k-fet' into 'master'
K-Fêt - 17-03-15

Closes #140, #111, #121, #128, #97, #117, #87, #127, and #109

See merge request !186
2017-03-24 20:23:58 +01:00
Aurélien Delobelle
cb13280458 Merge branch 'master' into 'Aufinal/merge_k-fet'
# Conflicts:
#   kfet/static/kfet/css/index.css
2017-03-24 20:23:32 +01:00
Ludovic Stephan
7520effe53 Fix K-Psul freeze when no-team password
L'erreur 403 est renvoyée dans ce cas par le décorateur
`@teamkfet_required`, donc sans data associé, ce qui faisait buguer
`getErrorsHtml`. On rajoute donc le cas correspondant.
2017-03-24 15:45:47 -03:00
Martin Pepin
33b3d558b5 Merge branch 'Aufinal/decorators' into 'master'
Utilise les bons décorateurs

See merge request !195
2017-03-21 00:25:50 +01:00
Ludovic Stephan
5e802217fd Remove lambda operators 2017-03-20 20:24:44 -03:00
Ludovic Stephan
dd4d1f3061 Improves creation efficiency 2017-03-20 20:19:04 -03:00
Ludovic Stephan
aa247b465a Fix search box (hackish) 2017-03-20 19:08:48 -03:00
Martin Pepin
ae38b5d1e7 Merge branch 'hotfix/prevent_ldap_injection' into 'master'
Hotfix/prevent ldap injection

Closes #150

See merge request !188
2017-03-20 23:06:59 +01:00
Martin Pépin
59f57793ba typo 2017-03-20 22:05:48 +00:00
Martin Pépin
0aed975615 Fix the empty-query test in autocomplete
If there is no valid word to search in the LDAP database, no query is
performed. Since 74f0b63e, that behaviour was broken because of a typo
2017-03-20 08:14:20 +00:00
Ludovic Stephan
6d36d50e9a Fix 'at' property for transfergroups 2017-03-20 01:56:59 -03:00
Ludovic Stephan
1fcd53d780 Continue renaming node.type to node.modelname 2017-03-20 00:42:12 -03:00
Ludovic Stephan
fe965875f7 Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history 2017-03-20 00:33:30 -03:00
Ludovic Stephan
3465dd7045 Change node.type to node.modelname for clarity 2017-03-20 00:26:11 -03:00
Ludovic Stephan
2c63e6b667 Use django.contrib.auth decorators 2017-03-20 00:11:50 -03:00
Ludovic Stephan
36dc6439a8 Plug createopes into loadkfetdevdata 2017-03-19 16:03:39 -03:00
Ludovic Stephan
0356ec34ae Add createopes command 2017-03-19 16:03:19 -03:00
Martin Pépin
74f0b63e96 Change ldap query behaviour if multiple inputs
It is now consistent with the other lookups over the User database
2017-03-19 15:10:08 +00:00
Martin Pépin
dc50a23b10 Escape the content of the regex in highligh_text 2017-03-19 14:48:04 +00:00
Martin Pepin
a057869d77 Merge branch 'Aufinal/fix_kfet_devdata' into 'master'
Données de test K-Fêt

See merge request !191
2017-03-19 15:15:02 +01:00
Martin Pépin
4899bba1f7 Replace list comprehensions by iterators in dal 2017-03-19 14:05:25 +00:00
Ludovic Stephan
c99e4f26d0 Move history initialisation as Config.reset callback 2017-03-19 04:59:55 +01:00
Ludovic Stephan
66c5a6953c Improve websocket filter for special history pages 2017-03-19 04:29:54 +01:00
Ludovic Stephan
7a00096170 Add support for account_read history 2017-03-18 22:48:50 -03:00
Ludovic Stephan
951932a6c8 Add support and websocket to transfers.html 2017-03-18 22:35:47 -03:00
Ludovic Stephan
fa64a68378 Add strict mode to history.html script 2017-03-18 22:15:09 -03:00
Ludovic Stephan
fc3e86aea6 Add websocket support to ArticleManager 2017-03-18 22:06:30 -03:00
Ludovic Stephan
51fba4da21 Log messages 2017-03-18 19:02:08 -03:00
Ludovic Stephan
47b7d934e0 PEP8 on imports 2017-03-18 19:01:51 -03:00
Ludovic Stephan
29d7654052 Root kfet account 2017-03-18 18:02:33 -03:00
Ludovic Stephan
f512c1bdd7 Add better checkout creation 2017-03-18 18:02:23 -03:00
Ludovic Stephan
b8a307b4a6 Add support for kfet/history page 2017-03-18 14:05:11 -03:00
Ludovic Stephan
1d532616b7 Fix bugs introduced by previous commit 2017-03-18 02:47:30 -03:00