197 commits

Author	SHA1	Message	Date
Ludovic Stephan	07290f6fec	Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history	2017-04-03 21:00:12 -03:00
Ludovic Stephan	3ce4dc5c85	Add article stock management	2017-04-03 20:14:45 -03:00
Ludovic Stephan	b91edc9c7d	Merge remote-tracking branch 'origin/aureplop/kpsul_js_refactor' into Aufinal/refactor_articles	2017-04-03 20:03:58 -03:00
Aurélien Delobelle	9d2298a089	Merge branch 'master' into aureplop/kpsul_js_refactor ... Not chill.	2017-04-04 00:51:49 +02:00
Ludovic Stephan	5020037103	api_lock inside kfet.js	2017-04-03 16:08:40 -03:00
Ludovic Stephan	ccf5f80685	Merge remote-tracking branch 'origin/master' into Aufinal/editions	2017-04-01 02:43:19 -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
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
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	499c081565	Websocket class and instance	2017-03-31 12:23:27 -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
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	24f72ae7d4	add missing ;	2017-03-26 14:52:23 +02:00
Aurélien Delobelle	b81b33c056	allow chaining on container in display method	2017-03-26 14:51:16 +02:00
Aurélien Delobelle	485ae86a42	add update method to ModelObject	2017-03-26 14:46:46 +02:00
Ludovic Stephan	3f07bf56fa	Remove console log	2017-03-26 00:25:51 -03:00
Ludovic Stephan	6be2f086df	Add generic functions for confirm dialogs	2017-03-26 00:20:28 -03:00
Ludovic Stephan	a1c976185c	Fix transfer sort	2017-03-25 13:44:35 -03:00
Ludovic Stephan	0997d85083	Merge branch 'aureplop/kpsul_js_refactor' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/refactor_history	2017-03-25 12:39:30 -03:00
Ludovic Stephan	5ff8f69bfa	Merge branch 'aureplop/kpsul_js_refactor' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/refactor_articles	2017-03-25 12:35:04 -03:00
Ludovic Stephan	f645121fb1	Add error when editing LIQ	2017-03-25 10:39:53 -03:00
Aurélien Delobelle	6afbcb44a1	delete array comprehesion	2017-03-25 10:26:45 +01:00
Aurélien Delobelle	967748ded3	details link to read instead of update ... - It was the old behaviour.	2017-03-25 09:58:20 +01:00
Ludovic Stephan	aa6a50a6e7	Simplify JS-Python interface for cancel_ops	2017-03-24 23:57:27 -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
Aurélien Delobelle	0d02d47d33	move utils functions	2017-03-24 22:05:04 +01:00
Aurélien Delobelle	2e3bd5bd7a	fix search box	2017-03-24 21:41:34 +01:00
Aurélien Delobelle	abce961d91	use django-js-reverse	2017-03-24 21:28:33 +01:00
Aurélien Delobelle	a9d1a6aae9	clean array iteration	2017-03-24 21:24:06 +01: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
Ludovic Stephan	1fcd53d780	Continue renaming node.type to node.modelname	2017-03-20 00:42:12 -03:00
Ludovic Stephan	fe965875f7	Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history	2017-03-20 00:33:30 -03:00
Ludovic Stephan	3465dd7045	Change node.type to node.modelname for clarity	2017-03-20 00:26:11 -03:00
Ludovic Stephan	66c5a6953c	Improve websocket filter for special history pages	2017-03-19 04:29:54 +01:00
Ludovic Stephan	951932a6c8	Add support and websocket to transfers.html	2017-03-18 22:35:47 -03:00
Ludovic Stephan	fc3e86aea6	Add websocket support to ArticleManager	2017-03-18 22:06:30 -03:00
Ludovic Stephan	b8a307b4a6	Add support for kfet/history page	2017-03-18 14:05:11 -03:00
Ludovic Stephan	1d532616b7	Fix bugs introduced by previous commit	2017-03-18 02:47:30 -03:00