Morpheus/gestioCOF
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity
1172 commits 40 branches 17 tags 11 MiB
Commit graph

413 commits

Author SHA1 Message Date
Ludovic Stephan
b113a57b74 Fix update function 2017-04-03 11:20:56 -03:00
Ludovic Stephan
e20ab2f352 Use set delete() 2017-04-01 09:18:40 -03:00
Ludovic Stephan
8da832c1f7 Use nice authentication in orders too 2017-04-01 00:36:39 -03:00
Ludovic Stephan
063446efb5 Use columns for authentication and submit 2017-04-01 00:32:09 -03:00
Ludovic Stephan
530aafad19 Use widget_tweaks 2017-03-31 11:07:37 -03:00
Ludovic Stephan
6ac1241bd3 Listen to submit instead 2017-03-31 10:07:42 -03:00
Ludovic Stephan
50cb6e51a1 Use Set() natively 2017-03-31 10:06:02 -03:00
Ludovic Stephan
e54324e9f1 Use col-offset 2017-03-31 09:50:37 -03:00
Ludovic Stephan
0c21238391 Change misc field when updating 2017-03-30 18:39:13 -03:00
Ludovic Stephan
998838ca3e Add update button 2017-03-30 13:31:16 -03:00
Ludovic Stephan
31888e33ce simpler jquery selection 2017-03-30 13:30:55 -03:00
Ludovic Stephan
eb7d436b90 Add "count finished" checkbox 2017-03-29 20:43:48 -03:00
Ludovic Stephan
e6a1d16860 Websocket to manage possible kpsul conflicts 2017-03-29 00:58:47 -03:00
Ludovic Stephan
3b793dc726 Add first improvements for inventory 2017-03-28 23:47:41 -03: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
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
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
2c63e6b667 Use django.contrib.auth decorators 2017-03-20 00:11:50 -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 Pépin
4899bba1f7 Replace list comprehensions by iterators in dal 2017-03-19 14:05:25 +00: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
Martin Pépin
55b67f38c8 Notice the users about the α-numeric restriction 
Add a help text above the two autocompletion inputs letting the users
know that non-alphanumeric characters will not be used.
 2017-03-16 23:16:56 +00:00
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
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
Qwann
5ddcd2f1ff Merge branch 'k-fet' into qwann/k-fet/home 2017-03-10 16:58:10 +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
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
197da29366 css include added... 2017-03-05 20:05:35 +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
Evarin
ddbcfe0c69 JS commenté et plus propre 2017-02-15 22:25:26 +01:00
Evarin
0fcb29252b Frontend tout en JS 2017-02-15 21:01:54 +01:00
Qwann
46f343b1ab la K-Fêt se réveille à 7h 2017-02-15 14:44:58 +01:00