Ludovic Stephan
|
cf03fba1cc
|
Remove whitespace by using elif
|
2017-03-31 23:54:38 -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
|
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 |
|
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 |
|
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 |
|
Ludovic Stephan
|
0c21238391
|
Change misc field when updating
|
2017-03-30 18:39:13 -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
|
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
|
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 |
|
Ludovic Stephan
|
eb7d436b90
|
Add "count finished" checkbox
|
2017-03-29 20:43:48 -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
|
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 |
|
Ludovic Stephan
|
946182f1fe
|
Simpler migration revert
|
2017-03-26 15:06:45 -03:00 |
|
Ludovic Stephan
|
06a89055c4
|
Simpler migration
|
2017-03-25 10:46:18 -03:00 |
|
Ludovic Stephan
|
9a081ddae0
|
PEP8 on Operation model
|
2017-03-25 10:43:02 -03:00 |
|
Ludovic Stephan
|
f645121fb1
|
Add error when editing LIQ
|
2017-03-25 10:39:53 -03:00 |
|