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 |
|
Ludovic Stephan
|
14e0d8090f
|
Add euros symbols
|
2017-03-25 10:01:35 -03:00 |
|
Ludovic Stephan
|
d8f572bb01
|
Remove group check in is_checkout
|
2017-03-25 09:57:44 -03:00 |
|
Ludovic Stephan
|
bc0affc038
|
Remove autocomplete leftovers
|
2017-03-25 09:56:36 -03:00 |
|
Aurélien Delobelle
|
ae82c34023
|
add missing migration
|
2017-03-25 11:21:21 +01:00 |
|
Aurélien Delobelle
|
215d4a63ad
|
Merge branch 'Aufinal/create_opes' into 'master'
K-Fêt - Dev :
- new command - createopes: Création d'opérations et transferts aléatoires
See merge request !193
|
2017-03-25 11:08:22 +01: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
|
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 |
|