Commit graph

1389 commits

Author SHA1 Message Date
Aurélien Delobelle
c355316045 Merge branch 'Aufinal/fix_stock_ws' into 'master'
K-Psul
- Fix: indicateur de stock bas

See merge request !201
2017-04-01 12:36:59 +02:00
Ludovic Stephan
ccf5f80685 Merge remote-tracking branch 'origin/master' into Aufinal/editions 2017-04-01 02:43:19 -03:00
Ludovic Stephan
cf03fba1cc Remove whitespace by using elif 2017-03-31 23:54:38 -03:00
Ludovic Stephan
2774dbb5de Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history 2017-03-31 23:51:13 -03:00
Ludovic Stephan
7d93d91af9 Merge remote-tracking branch 'origin/aureplop/kpsul_js_refactor' into Aufinal/refactor_articles 2017-03-31 23:50:33 -03:00
Ludovic Stephan
9c9ad21d73 Add variable for article line 2017-03-31 23:46:10 -03:00
Ludovic Stephan
92fd94d1f9 Merge remote-tracking branch 'origin/master' into Aufinal/fix_stock_ws 2017-03-31 23:43:19 -03:00
Aurélien Delobelle
1286606f7a Merge branch 'Aufinal/hotfix/liq_withdraw' into 'master'
K-Fêt :
- Empêche les retraits/charges sur LIQ

See merge request !205
2017-03-31 23:49:33 +02:00
Aurélien Delobelle
fafa7e536e Merge branch 'Aufinal/websockets' into 'master'
K-Fêt :
- Ajout d'une classe générale pour les websockets

See merge request !204
2017-03-31 23:40:02 +02:00
Ludovic Stephan
aa29621c7c Prevents special opes on LIQ 2017-03-31 18:28:03 -03:00
Ludovic Stephan
236dcb4644 Tweaks to UserDialog 2017-03-31 18:10:06 -03:00
Ludovic Stephan
582cdebaa1 Better callback management 2017-03-31 17:49:22 -03:00
Ludovic Stephan
ab15dbae76 Add handler management 2017-03-31 17:37:39 -03:00
Ludovic Stephan
38bfccf331 Change class name 2017-03-31 15:57:15 -03:00
Ludovic Stephan
8bf1bd5343 Websocket as member 2017-03-31 15:45:15 -03:00
Ludovic Stephan
413df0806d Add url get method 2017-03-31 15:10:41 -03:00
Ludovic Stephan
49c84076de Manage help_text and errors 2017-03-31 15:01:31 -03:00
Ludovic Stephan
1d8e084a19 websocket update when addcost 2017-03-31 14:37:00 -03: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
Ludovic Stephan
499c081565 Websocket class and instance 2017-03-31 12:23:27 -03:00
Ludovic Stephan
fdcd2e864c Use widget_tweaks everywhere 2017-03-31 11:24:38 -03: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
Ludovic Stephan
ebf133d9af Lowercase model verbose names 2017-03-30 21:38:16 -03:00
Ludovic Stephan
20561eb515 Idem for account_update 2017-03-30 21:31:16 -03:00
Ludovic Stephan
c1b8849cb8 Idem for supplier_form 2017-03-30 21:16:47 -03:00
Ludovic Stephan
91d5fe234c Idem for checkoutstatements 2017-03-30 21:10:50 -03:00
Ludovic Stephan
8e65298c7c Idem for article_update 2017-03-30 19:34:22 -03:00
Ludovic Stephan
079666c0db Use verbose names and form snippets for article_create 2017-03-30 19:32:11 -03:00
Martin Pepin
63cb7b7fd0 Merge branch 'Aufinal/dev_supplier' into 'master'
Ajoute un fournisseur aux données de dev

See merge request !202
2017-03-30 19:04:22 +02:00
Ludovic Stephan
56b5fd6279 Always randomize supplier articles 2017-03-29 23:22:18 -03:00
Ludovic Stephan
95c59de4fc Add supplier to dev data 2017-03-29 23:16:40 -03:00
Martin Pépin
f32f83db75 Merge branch 'hotfix/bda_mail_context' 2017-03-29 18:43:55 +01:00
Martin Pépin
2d22c202e9 Prevent side effects while sending emails 2017-03-29 18:17:20 +01:00
Ludovic Stephan
ca6e120a38 Fix ws stock update 2017-03-29 09:43:10 -03:00
Martin Pépin
c95d7cb670 Merge branch 'master' of git.eleves.ens.fr:cof-geek/gestioCOF 2017-03-29 11:21:11 +01:00
Martin Pépin
47e1071b12 Merge branch 'Production' 2017-03-29 11:20:55 +01:00
Martin Pépin
579711ed2d Hotfix: typo in template name 2017-03-29 11:17:34 +01:00
Ludovic Stephan
08c752f1b3 Simplify addcost management 2017-03-26 18:10:26 -03:00
Ludovic Stephan
5101400f64 Use callback_as_dict for addcost 2017-03-26 17:57:51 -03:00
Ludovic Stephan
c1f70d9d0a Add capslock support for inputs 2017-03-26 17:51:55 -03:00
Ludovic Stephan
6d92df4155 Merge branch 'aureplop/kpsul_js_refactor' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/dialog_utils 2017-03-26 15:21:33 -03:00
Ludovic Stephan
946182f1fe Simpler migration revert 2017-03-26 15:06:45 -03:00
Aurélien Delobelle
842f2cecc1 fix import, fix ope with addcost enabled, move Config location 2017-03-26 15:12:03 +02:00
Aurélien Delobelle
bc6ecda0c8 fix addcost kspul 2017-03-26 14:59:21 +02:00
Aurélien Delobelle
24f72ae7d4 add missing ; 2017-03-26 14:52:23 +02:00