TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • b036f16437 integrate debugbar module Manuel Raynaud 2013-09-07 16:39:52 +02:00
  • 1e660cd930 Merge branch 'delivery' Manuel Raynaud 2013-09-07 16:37:54 +02:00
  • 9ebf16f1f6 remove htmlpurifier Manuel Raynaud 2013-09-07 16:36:41 +02:00
  • c9aa06fd70 modify insert.sql including debugBar module Manuel Raynaud 2013-09-07 16:34:51 +02:00
  • ed468ccb67 Merge branch 'master' into debugbar Manuel Raynaud 2013-09-07 16:31:29 +02:00
  • 5315e13ce9 add new event and new tag Manuel Raynaud 2013-09-07 16:31:15 +02:00
  • 3bd3a4d943 Started category modification franck 2013-09-07 10:59:43 +02:00
  • f304caa88f Factorized modal dialogs javascript franck 2013-09-06 20:26:29 +02:00
  • e8d96937e7 Factorized creation and confirmation modal dialogs franck 2013-09-06 20:00:02 +02:00
  • 49be95a2e7 Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-09-06 19:38:08 +02:00
  • 86d6a0fa05 Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-09-06 19:36:52 +02:00
  • 0aad4baf26 create controller adding delivery module in session Manuel Raynaud 2013-09-06 19:29:19 +02:00
  • b067ef7dcc create Delivery loop Manuel Raynaud 2013-09-06 18:41:44 +02:00
  • c6612a0246 Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-06 17:51:10 +02:00
  • ae667d33ee Working : mespeche 2013-09-06 17:50:19 +02:00
  • d11906eca5 Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-06 17:48:12 +02:00
  • c68f282fe8 Continuing categories administration... franck 2013-09-06 17:46:40 +02:00
  • 0adbb9a997 Working : mespeche 2013-09-06 17:45:22 +02:00
  • a3b7e977da create base loop for delivery and payment entities Manuel Raynaud 2013-09-06 17:40:49 +02:00
  • 2fda14cfeb remove htmlpurifier dependency Manuel Raynaud 2013-09-06 17:35:51 +02:00
  • fa7d88f8dc country id can be an argument for calculate method Manuel Raynaud 2013-09-06 17:34:25 +02:00
  • 8b82f58a5b Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-06 17:24:05 +02:00
  • 771d9e6322 Working : mespeche 2013-09-06 17:23:06 +02:00
  • eebe1d4f58 Working : mespeche 2013-09-06 16:47:21 +02:00
  • e9c47bf59d fix typo Manuel Raynaud 2013-09-06 16:45:13 +02:00
  • 8ba5ef616d change phpdoc for BaseLoop::exec method Manuel Raynaud 2013-09-06 16:34:55 +02:00
  • def9b5dd1b Merge branch 'master' of https://github.com/thelia/thelia mespeche 2013-09-06 16:33:50 +02:00
  • c5f1e5288c Working : mespeche 2013-09-06 16:32:27 +02:00
  • 5b637598e9 refactor phpdoc block for BaseLoop::getArgDefinitions(); Manuel Raynaud 2013-09-06 16:31:04 +02:00
  • af93f810f7 Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-06 16:19:06 +02:00
  • 8bd7a6413d Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-06 16:18:54 +02:00
  • 1c307385ce fix typo Manuel Raynaud 2013-09-06 16:16:48 +02:00
  • ab134f872c Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-09-06 16:15:04 +02:00
  • 1d231dc11b Merge branch 'master' of github.com:thelia/thelia Etienne Roudeix 2013-09-06 16:14:38 +02:00
  • 3ac3224e1c add help in BaseController for retrieving the translator (method getTranslator) Manuel Raynaud 2013-09-06 16:14:35 +02:00
  • f2aad186f6 position output in loops Etienne Roudeix 2013-09-06 16:13:51 +02:00
  • 2dee65727d set good module delivery id in session Manuel Raynaud 2013-09-06 16:12:57 +02:00
  • 6fdf60b960 Categories refactoring franck 2013-09-06 15:56:06 +02:00
  • ebb350111a Working : mespeche 2013-09-06 15:00:52 +02:00
  • 56de467362 Working : mespeche 2013-09-06 12:55:53 +02:00
  • fed1795e93 Working : mespeche 2013-09-06 12:30:40 +02:00
  • a9f2b70ab5 Working : mespeche 2013-09-06 12:29:38 +02:00
  • b6a216fd9b substitutions : product category folder content Etienne Roudeix 2013-09-06 12:21:36 +02:00
  • c015bbe8b5 Working : mespeche 2013-09-06 12:12:27 +02:00
  • 7e28c92b0b Working : mespeche 2013-09-06 11:48:24 +02:00
  • 8a5e12f814 WIP - Add Coupon, Rules, CouponManager, Adapter as Services - Refactor Coupon to use these services gmorel 2013-09-06 11:47:00 +02:00
  • 1686d6d87c each module is available in the container with name module.ModuleName Manuel Raynaud 2013-09-06 11:43:37 +02:00
  • a82251b4b6 Working : mespeche 2013-09-06 11:15:39 +02:00
  • 86569b01a5 Working : mespeche 2013-09-06 11:13:47 +02:00
  • 7f10926b03 Working : mespeche 2013-09-06 11:07:44 +02:00
  • 7b3cd46261 Working : mespeche 2013-09-06 10:44:50 +02:00
  • bbce082df3 Fixed minor visual glitches franck 2013-09-06 10:41:19 +02:00
  • b83117653f Merge branch 'master' of https://github.com/thelia/thelia mespeche 2013-09-06 10:16:33 +02:00
  • 617b762d8a Working : Resize countries flag + Add bootstrap-switch mespeche 2013-09-06 10:16:08 +02:00
  • 2ef5e8bd0c fix test suite Manuel Raynaud 2013-09-06 10:08:30 +02:00
  • 8538343a37 Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-09-06 09:58:54 +02:00
  • 012432dad0 clear asset cache in cache:cler command Manuel Raynaud 2013-09-06 09:58:35 +02:00
  • 30831f0ab5 Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-06 09:57:18 +02:00
  • 9655ce3c72 Added a 'development mode' to assetic smarty plugin franck 2013-09-06 09:56:39 +02:00
  • b95218295d rewriting router Etienne Roudeix 2013-09-06 08:59:06 +02:00
  • 41ed2dcebd Merge branch 'master' of github.com:thelia/thelia Etienne Roudeix 2013-09-06 08:25:52 +02:00
  • 89ad332d88 use good Request object Manuel Raynaud 2013-09-06 08:24:03 +02:00
  • eeedd540bc Merge branch 'master' of github.com:thelia/thelia Etienne Roudeix 2013-09-06 07:53:48 +02:00
  • c6884274ed Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-09-06 07:51:37 +02:00
  • c540bf5b09 Merge branch 'rewrite_routing' Manuel Raynaud 2013-09-06 07:51:21 +02:00
  • 351c669e05 Merge branch 'master' of github.com:thelia/thelia Etienne Roudeix 2013-09-06 07:49:14 +02:00
  • c8a5734a9e Added Tools\URL test case, and a test case superclass for initializing Tools\URL franck 2013-09-06 01:55:16 +02:00
  • 07f0f34e5c Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-05 23:31:07 +02:00
  • 318fb3bf2d Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-05 23:30:50 +02:00
  • e82a49d326 remove unused UrlWritin controller Manuel Raynaud 2013-09-05 20:53:03 +02:00
  • 00d7d9b29a create router for rewriting matching Manuel Raynaud 2013-09-05 20:46:46 +02:00
  • eea29cba06 WIP - Add Coupon, Rules, CouponManager, Adapter as Services - Refactor Coupon to use these services gmorel 2013-09-05 20:07:17 +02:00
  • a0f894d70f customer substitutions Etienne Roudeix 2013-09-05 17:54:04 +02:00
  • c8763be6ae Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-09-05 17:43:32 +02:00
  • f6ab8888f3 start creating debugbar Manuel Raynaud 2013-09-05 17:43:12 +02:00
  • d921341d94 fix typo in front id Manuel Raynaud 2013-09-05 16:56:38 +02:00
  • c276ab236e Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-05 16:53:07 +02:00
  • baa1df6d59 Working : For attributes on labels mespeche 2013-09-05 16:52:17 +02:00
  • e289c8026f Working : For attributes on labels mespeche 2013-09-05 16:51:45 +02:00
  • 40b524e9d6 add label_attr attribute to form smarty plugin Manuel Raynaud 2013-09-05 14:22:28 +02:00
  • c63120478b start refactorin rewriting routing Manuel Raynaud 2013-09-05 12:25:27 +02:00
  • f4c2f865e4 Working : clean of currency-edit page mespeche 2013-09-05 11:29:07 +02:00
  • 91670d8347 Working : Add of bootstrap-editable in good directories mespeche 2013-09-05 11:14:31 +02:00
  • 967cb735f0 Merge branch 'master' of https://github.com/thelia/thelia mespeche 2013-09-05 11:12:34 +02:00
  • 5d6f01d338 Working : Clean of currencies list and storage bootstrap-editable mespeche 2013-09-05 11:12:18 +02:00
  • cd5032fc51 Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-09-05 10:26:07 +02:00
  • be44367d41 enable auto-escapin in smarty Manuel Raynaud 2013-09-05 10:25:45 +02:00
  • 3b27a71967 Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-05 10:00:39 +02:00
  • 271e6c64f0 Before merging coupon franck 2013-09-05 10:00:17 +02:00
  • 1e334dccee Merge branch 'master' of https://github.com/thelia/thelia mespeche 2013-09-05 09:57:57 +02:00
  • 75513c778a Working : New version of bootstrap-editable + Update of currency pages to bootstrap3 mespeche 2013-09-05 09:56:06 +02:00
  • b70f5b1d68 fix typo in method name Manuel Raynaud 2013-09-05 09:25:15 +02:00
  • b0ac5f3f03 add more test on DefaultController Manuel Raynaud 2013-09-05 09:24:22 +02:00
  • 86892f7af6 fix issue for retrieving default view in defaultController Manuel Raynaud 2013-09-05 09:10:53 +02:00
  • c22761b60a fix issue if base_url does not exists Manuel Raynaud 2013-09-05 09:00:46 +02:00
  • fae48e9ee4 fix issue in Lang Model Manuel Raynaud 2013-09-05 08:35:47 +02:00
  • 43a2c0ac7b refactor Lang table Manuel Raynaud 2013-09-05 08:30:15 +02:00
  • a9b0f53334 Merge remote-tracking branch 'origin/coupon' into coupon gmorel 2013-09-04 19:25:57 +02:00
  • 23a4ff26c8 Working - Base create/update coupon in backoffice gmorel 2013-09-04 19:22:20 +02:00
  • 58a68b1959 Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-04 19:03:37 +02:00