cst1/kpsul
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity

Commit graph

  • 3c8f1c58c5 Use transaction.atomic instead of lock_table Martin Pépin 2017-05-23 05:56:29 +0100
  • f0f1585661 Registration: remove success var, fix message Martin Pépin 2017-05-23 05:41:57 +0100
  • a36d002b17 Merge branch 'Kerl/apt_upgrade' into 'master' Aurélien Delobelle 2017-05-22 15:08:16 +0200
  • 3762b38afe Remove useless pip upgrade in bootstrap.sh Martin Pépin 2017-05-22 10:29:38 +0100
  • dba8a0a857 Remove the num field in CofProfile Martin Pépin 2017-05-22 00:06:17 +0100
  • 76dcaf7d51 drop py2 compat Martin Pépin 2017-05-21 23:39:36 +0100
  • eff1b7ff19 Cleaning - Article autocomplete, ForestDisplay and more Aurélien Delobelle 2017-05-21 20:03:37 +0200
  • 17b140fb12 Upgrade apt packages while provisioning Martin Pépin 2017-05-21 18:42:30 +0100
  • 51083f9195 Merge branch 'aureplop/kpsul_js_refactor' into aureplop/js_basket Aurélien Delobelle 2017-05-21 13:01:51 +0200
  • e60e347a53 Add base templates to extend Aurélien Delobelle 2017-05-20 13:57:21 +0200
  • c76b729320 Merge branch 'aureplop/ws_checkout' into 'aureplop/kpsul_js_refactor' Ludovic Stephan 2017-05-19 21:50:29 +0200
  • 1845ce825f jpp Aurélien Delobelle 2017-05-19 20:13:36 +0200
  • 109a692cea Order creation improvements. Aurélien Delobelle 2017-05-19 17:55:31 +0200
  • c0b8430a12 Better scale management for order creation Aurélien Delobelle 2017-05-19 17:40:06 +0200
  • c11c3f84ed clean big tables forms Aurélien Delobelle 2017-05-19 16:42:26 +0200
  • 4344b7d537 chrome support Aurélien Delobelle 2017-05-19 15:13:27 +0200
  • 0995f712ca clean hover/focus/disabled btn Aurélien Delobelle 2017-05-19 14:48:57 +0200
  • ecce2fda21 Merge branch 'master' into aureplop/clean_scroll Aurélien Delobelle 2017-05-19 14:08:57 +0200
  • 51dca32d05 shorter transitions Aurélien Delobelle 2017-05-19 14:01:13 +0200
  • ae27065626 Group permissions select multiple -> checkboxes Aurélien Delobelle 2017-05-19 13:42:41 +0200
  • e9073e2265 Improve multiple select inputs Aurélien Delobelle 2017-05-18 21:41:23 +0200
  • 1a661c1fd3 revert Aurélien Delobelle 2017-05-18 20:29:29 +0200
  • 5776c81764 Clean navbar + content_center only Aurélien Delobelle 2017-05-18 20:17:05 +0200
  • 8a9d6712ee Merge branch 'aureplop/kpsul_js_refactor' into aureplop/js_basket Aurélien Delobelle 2017-05-18 13:41:56 +0200
  • 914d2ca870 Add last statement update support. Aurélien Delobelle 2017-05-18 13:33:53 +0200
  • 86a3ae3c2f clean Aurélien Delobelle 2017-05-18 12:49:39 +0200
  • ef1f00c15b Merge branch 'aureplop/fix_ws' into 'aureplop/kpsul_js_refactor' Ludovic Stephan 2017-05-18 03:39:53 +0200
  • a0503d0c53 Refactor K-Psul basket (big part) Aurélien Delobelle 2017-05-18 02:13:42 +0200
  • 24b9aaae39 Revert template literals use Aurélien Delobelle 2017-05-16 18:47:26 +0200
  • cb0c0be8a2 filters on ws for khistory Aurélien Delobelle 2017-05-16 18:08:40 +0200
  • 02a015e633 fix data sent to ws by perform_transfers Aurélien Delobelle 2017-05-16 17:08:51 +0200
  • bacc079778 Merge branch 'master' into aureplop/kpsul_js_refactor Aurélien Delobelle 2017-05-16 16:48:12 +0200
  • bc71e1628a keep eslint quiet Aurélien Delobelle 2017-05-16 12:27:39 +0200
  • 311e0c48bd Merge branch 'Aufinal/refactor_history' into 'aureplop/kpsul_js_refactor' Aurélien Delobelle 2017-05-16 10:48:07 +0200
  • 6a6fc38ead Add selection reset to cancel_opes Ludovic Stephan 2017-05-15 21:10:39 -0300
  • 43e772363e Extend history options Ludovic Stephan 2017-05-15 19:29:12 -0300
  • 93c8844b3f typo Ludovic Stephan 2017-05-15 19:28:24 -0300
  • c2da055b60 Remove duplicate ws updates Ludovic Stephan 2017-05-15 18:59:18 -0300
  • 95a8b484e0 Merge branch 'Aufinal/fix_history' into 'master' Aurélien Delobelle 2017-05-15 23:43:28 +0200
  • 647b32e727 Move displayAddcost function Ludovic Stephan 2017-05-15 17:52:49 -0300
  • ac33e6302e Fix addExistingPurchase + few other bugs Ludovic Stephan 2017-05-15 17:39:33 -0300
  • ad42687293 Fix tranfers page Ludovic Stephan 2017-05-15 15:27:46 -0300
  • f4cb1e2e83 Add opesonly option Ludovic Stephan 2017-05-15 14:17:58 -0300
  • 40c10a0509 Merge branch 'master' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/k-fet/graphs Qwann 2017-05-15 18:53:08 +0200
  • cc611e5132 working Qwann 2017-04-19 12:26:29 +0200
  • 6871945dcd Merge branch 'aureplop/fix_perms' into 'master' Martin Pepin 2017-05-15 11:29:33 +0200
  • bf0e345301 Fix asynchronous calls with resetSettings Ludovic Stephan 2017-05-14 23:50:09 -0300
  • c12c705f8b Bind ForestDisplay to initial data Ludovic Stephan 2017-05-14 20:18:31 -0300
  • e0b1db1e1e more robust tests Aurélien Delobelle 2017-05-14 22:19:25 +0200
  • 31b742fdb7 Move ws update to respective classes Ludovic Stephan 2017-05-14 17:19:09 -0300
  • cacdde3f87 Remove duplicate locations Martin Pépin 2017-05-14 15:47:07 +0100
  • 8a751e5c85 Use a separate models for events' locations Martin Pépin 2017-04-11 02:48:39 +0100
  • 5d8427e601 Merge branch 'aureplop/fewer_requests' into 'master' Martin Pepin 2017-05-12 21:13:35 +0200
  • 4ac7b30bdd Fix UserGroupForm + tests for this form. Aurélien Delobelle 2017-05-12 16:55:18 +0200
  • b1e46792c8 (little) cleaning of order_create view Aurélien Delobelle 2017-05-10 13:11:47 +0200
  • b0e7ebfbc5 fix typo + pep8 + del future imports Aurélien Delobelle 2017-05-10 12:49:14 +0200
  • 6cdb791989 fix class name conflicts Aurélien Delobelle 2017-05-10 12:39:56 +0200
  • e7266e7a9d use new settings for redis Aurélien Delobelle 2017-04-26 11:28:18 +0200
  • 673dc0295d Merge branch 'master' into aureplop/fix_cache Aurélien Delobelle 2017-04-26 11:22:29 +0200
  • 4ed5128829 Merge branch 'Kerl/settings2' into 'master' Aurélien Delobelle 2017-04-26 11:19:44 +0200
  • fb4258f821 Set the redis passwd properly in bootstrap.sh Martin Pépin 2017-04-25 20:23:51 +0100
  • dbff7740c8 Add REDIS_PORT to the settings and secrets Martin Pépin 2017-04-25 20:23:21 +0100
  • 5c5fc6da1b Merge branch 'aureplop/less_prices_history' into 'master' Ludovic Stephan 2017-04-25 14:32:18 +0200
  • 52d9979d7c Fix settings in the provisioning script Martin Pépin 2017-04-24 21:52:40 +0100
  • 2aee43e01a Add more configuration options for redis Martin Pépin 2017-04-24 21:27:01 +0100
  • 8b8a3f8a25 Update button in history Ludovic Stephan 2017-04-24 14:46:16 -0300
  • 16dbfed977 Add chidren div in display Ludovic Stephan 2017-04-24 14:12:03 -0300
  • 5096e5f129 Adapt ArticleManager Ludovic Stephan 2017-04-24 13:25:18 -0300
  • 46ac82fd27 Adapt history to changes Ludovic Stephan 2017-04-24 13:25:07 -0300
  • e283439ebc Create ForestDisplay class Ludovic Stephan 2017-04-24 13:21:56 -0300
  • 20d635137c Merge remote-tracking branch 'origin/aureplop/kpsul_js_refactor' into Aufinal/refactor_history Ludovic Stephan 2017-04-24 11:30:01 -0300
  • 739990cdb6 Add total boxes to new inventory view + fix/clean Aurélien Delobelle 2017-04-22 01:17:23 +0200
  • 6de0844d28 Merge branch 'master' into aureplop/clean_scroll Aurélien Delobelle 2017-04-21 22:28:22 +0200
  • 0d8a613f28 improve bda inscription form/view code Aurélien Delobelle 2017-04-21 18:22:53 +0200
  • d9411c5b5a Add box_capacity to template + minor changes Manet/k-fet/fix/160 Hugo Manet 2017-04-18 11:43:27 +0200
  • 2eee8f58aa Merge branch 'master' into aureplop/fewer_requests Aurélien Delobelle 2017-04-17 20:45:01 +0200
  • 8622002e8d minor change Aurélien Delobelle 2017-04-17 20:40:54 +0200
  • 96dbfc22da Add two weeks, count in negative Hugo Manet 2017-04-16 20:47:45 +0200
  • dbf5844f6a Clean settings redis Aurélien Delobelle 2017-04-15 14:41:55 +0200
  • e772d12721 Merge branch 'master' into aureplop/fix_cache Aurélien Delobelle 2017-04-15 14:27:20 +0200
  • a0fe94e2f4 Merge branch 'Kerl/settings' into 'master' Aurélien Delobelle 2017-04-15 14:25:47 +0200
  • ce23eece6a Fix display on small screen devices. Aurélien Delobelle 2017-04-15 13:03:01 +0200
  • ea81ab7b25 Few display improvements. Aurélien Delobelle 2017-04-15 12:36:11 +0200
  • ff73a635f8 Minor fixes in settings/ Martin Pépin 2017-04-15 11:09:16 +0100
  • b2a5dfd682 Move permission check Ludovic Stephan 2017-04-14 12:51:58 -0300
  • 100686457b Change select_related for future compatibility Ludovic Stephan 2017-04-14 12:47:15 -0300
  • b544d6c5b3 Better alignment Ludovic Stephan 2017-04-14 12:45:38 -0300
  • 659b20891e Add filter to cancel_opes Ludovic Stephan 2017-04-14 12:43:59 -0300
  • 034a661444 Tweaks on kfet.js Ludovic Stephan 2017-04-14 12:12:43 -0300
  • de865c61aa Move container clearing Ludovic Stephan 2017-04-14 11:36:52 -0300
  • b0d35667b3 Merge branch 'master' into aureplop/kpsul_js_refactor Aurélien Delobelle 2017-04-14 15:56:44 +0200
  • 0a21858b33 Use css for scroll positionning Aurélien Delobelle 2017-04-14 13:08:03 +0200
  • 55b509b3dd Merge branch 'aureplop/fix_negative' into 'master' Ludovic Stephan 2017-04-13 18:20:24 +0200
  • 7db497d095 Less articles prices history Aurélien Delobelle 2017-04-13 16:34:29 +0200
  • 9668f1d1ec Account: check_negative() -> update_negative() Aurélien Delobelle 2017-04-13 15:48:13 +0200
  • 18425b82c2 Check negative on cancellation. Aurélien Delobelle 2017-04-13 15:15:59 +0200
  • 06572f0bb5 Order create use Scale. Aurélien Delobelle 2017-04-13 14:11:44 +0200
  • 3f4a1adbb9 Fewer queries on stats/scales + Fix Aurélien Delobelle 2017-04-12 18:03:31 +0200
  • e97e0081d7 Fewer queries on stats of an account balance. Aurélien Delobelle 2017-04-11 23:13:54 +0200
  • b5cc26bb1b Merge branch 'master' into aureplop/fewer_requests Aurélien Delobelle 2017-04-11 22:46:18 +0200