Qwann
232b293052
typos fixed
2017-01-20 20:27:24 +01:00
Qwann
f8c49ae90c
docstring instead of comments
2017-01-20 20:19:28 +01:00
Qwann
e6854d7987
using strftime instead of a personnal function
2017-01-20 20:19:16 +01:00
Qwann
de3db1405e
Merge branch 'qwann/decimal_fixes' into qwann/k-fet/stats
2017-01-20 18:53:49 +01:00
Qwann
fff7a2022b
conflict solved
2017-01-20 18:45:28 +01:00
Qwann
8b4f7ad60c
decimal cast for operation.amount
2017-01-20 18:34:45 +01:00
Qwann
7e5910e0b3
balance templatetag fixed
2017-01-20 18:10:49 +01:00
Ludovic Stephan
1b0144691f
No need for len of query
2017-01-20 07:32:11 -02:00
Ludovic Stephan
832dc0ce10
Search shortcut
2017-01-19 22:54:11 -02:00
Ludovic Stephan
016989c4de
search results css
2017-01-19 22:53:58 -02:00
Ludovic Stephan
e7956f3b62
Account search w/ autocomplete
2017-01-19 12:36:40 -02:00
Ludovic Stephan
eff37f6c89
plain text highlighting
2017-01-19 01:42:00 -02:00
Ludovic Stephan
88aec52141
PEP8 + typo
2017-01-19 01:22:04 -02:00
Qwann
bdbb252a05
Revert "first fixes"
...
This reverts commit 5877218af5
2017-01-17 17:16:53 +01:00
Ludovic Stephan
d6e13dbd61
Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/visibilite_stock
2017-01-16 23:57:27 -02:00
Qwann
1ddd34d50e
Merge branch 'qwann/k-fet/stats' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/k-fet/stats
2017-01-14 16:24:56 +01:00
Qwann
a14f1db9a1
doc added for kfet new fixtures
2017-01-14 16:23:45 +01:00
Michele Orrù
76db0c86a3
Add fixtures.
...
Create fixtures for kfet application:
- Add a bunch of non-cof profiles whose "last_name" is "Romain";
- Add k-fet articles using the real ones as a template;
- Add LIQ account;
- Add groups K-fet Chef and K-fet Girl;
- Add "caisse".
We also added some template for future tests (well, actually it's the script
used to generate the fixtures…).
2017-01-14 16:23:45 +01:00
Qwann
5877218af5
first fixes
2017-01-14 16:23:45 +01:00
Ludovic Stephan
fabd0949e2
correct imports
...
Signed-off-by: Ludovic Stephan <lstephan@clipper.ens.fr>
2017-01-10 15:15:53 -02:00
Ludovic Stephan
6315ddf6b8
move pwd change to method
...
Signed-off-by: Ludovic Stephan <lstephan@clipper.ens.fr>
2017-01-10 12:58:35 -02:00
Martin Pépin
703921a314
Supprime du code mort
2017-01-07 17:36:18 +01:00
Ludovic Stephan
7dc7d57a5e
restrict to team even if malicious POST edit
2017-01-07 13:57:54 -02:00
Ludovic Stephan
fcf76b4af8
can change own password (actually working now)
2017-01-07 13:32:05 -02:00
Ludovic Stephan
2a20beeb59
pep8
2017-01-07 13:28:53 -02:00
Ludovic Stephan
1c5c1fe94d
can change own password
2017-01-07 12:47:43 -02:00
Aurélien Delobelle
b6bd08170e
fix pip warning
2017-01-07 03:47:10 +01:00
Aurélien Delobelle
dd43f9d868
Merge branch 'Aufinal/previous_op' into 'k-fet'
...
Rappel de l'opération précédente sur K-Psul
Rajoute un champ d'informations sur la précédente opération validée (sur
la machine, pas sur le serveur) : valeur du panier et solde restant dans
le cas d'un utilisateur, et valeur du panier et rendus de monnaie dans
le cas d'une opération en liquide.
Fix #110
See merge request !146
2017-01-07 02:33:53 +01:00
Aurélien Delobelle
a34732cc9d
ajouts supp. previous_op
...
- Le trigramme est obtenu à partir de ``account_data`` qui contient les
données traitées et validées relatives au compte en train de commander.
- L'opération précédente disparaît en cas de ``hard reset``
2017-01-07 02:28:19 +01:00
Aurélien Delobelle
7ed9c90726
fix whitespaces
2017-01-07 01:56:33 +01:00
Aurélien Delobelle
86286b662a
Merge branch 'Aufinal/search_icon' into k-fet
...
- Ajoute une icône de recherche dans K-Psul pour accéder à la liste des comptes
2017-01-07 01:12:13 +01:00
Aurélien Delobelle
1bae76a405
Merge branch 'Aufinal/arrondi_ukf' into k-fet
...
- Arrondis cohérents des UKF lors des divers affichages
- Remplace les arrondis par des floor pour éviter les négatifs de quelques
centimes
Fix #92
See merge request !124
2017-01-07 01:02:07 +01:00
Aurélien Delobelle
792c4177ec
Merge branch 'master' into k-fet
2017-01-07 00:38:54 +01:00
Ludovic Stephan
c58ac3a904
Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/search_icon
2017-01-06 19:01:00 -02:00
Ludovic Stephan
a78a4393d0
Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/arrondi_ukf
2017-01-06 19:00:17 -02:00
Ludovic Stephan
20079c37e9
Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/previous_op
2017-01-06 18:20:54 +01:00
Martin Pépin
672b8727b7
Merge branch 'michele.orru/gestioCOF-master'
...
Deleting a CofProfile => Deleting the associated User
2017-01-06 17:00:06 +01:00
Martin Pépin
8568ecedba
Update provisioning
...
Django has now access to the test datebase
2017-01-06 16:58:27 +01:00
Martin Pepin
888d4764e8
Merge branch 'Kerl/clean_staticfiles' into 'master'
...
Cesse d'utiliser des fichiers statiques custom
Fixes #107
See merge request !121
2017-01-06 16:51:46 +01:00
Aurélien Delobelle
d6542d8b21
Fix websocket for dev and www
...
Le ProxyPass ignorait apparemment le header `Daphne-Root-Path`
2017-01-05 15:52:25 +01:00
Aurélien Delobelle
e292318245
Fix WebSocket failure on K-Psul
2017-01-05 14:27:25 +01:00
Michele Orrù
542d02ca6d
Cosmetics: post_save-ing a CofProfile now with decorators.
2017-01-05 11:35:34 +01:00
Michele Orrù
8016078e4f
Deleting a CofProfile ⇒ Deleting a User.
...
There's no reason for keeping a User if its respective cofprofile was deleted.
No?
Unittests attached.
2017-01-05 11:35:21 +01:00
Martin Pépin
e8fe856262
Merge branch 'master' into Kerl/fix_petits_cours_json
2017-01-05 08:48:20 +01:00
Martin Pépin
bc5a323dfe
Add missing migration
2017-01-04 15:29:28 +01:00
Qwann
ca28826d78
doc added for kfet new fixtures
2017-01-03 02:22:46 +01:00
Qwann
9cb5844c48
Revert "Update README.md for new kfet fixtures"
...
This reverts commit 06370bc62a
2017-01-03 02:19:50 +01:00
Erkan Narmanli
06370bc62a
Update README.md for new kfet fixtures
2017-01-03 02:13:42 +01:00
Qwann
63b3fef78f
Merge branch 'michele.orru/gestioCOF-k-fet' into k-fet
2017-01-03 01:50:34 +01:00
Michele Orrù
0b54972aa8
Add fixtures.
...
Create fixtures for kfet application:
- Add a bunch of non-cof profiles whose "last_name" is "Romain";
- Add k-fet articles using the real ones as a template;
- Add LIQ account;
- Add groups K-fet Chef and K-fet Girl;
- Add "caisse".
We also added some template for future tests (well, actually it's the script
used to generate the fixtures…).
2017-01-03 01:35:56 +01:00
