Commit Graph

  • d3a287333e Fixed TheliaLoop Smarty plugin (lopp imbrication was broken) franck 2013-09-04 19:02:26 +02:00
  • 910477f371 Working : Migration form to bootstrap3 mespeche 2013-09-04 18:08:13 +02:00
  • f399b1de2e Working - Render form now can render CheckBox gmorel 2013-09-04 18:04:23 +02:00
  • 31c074d492 Fixed image tests franck 2013-09-04 17:59:07 +02:00
  • 3f405d1ce9 Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-09-04 17:57:41 +02:00
  • ceb02841e1 validate create and update address in front context Manuel Raynaud 2013-09-04 17:52:58 +02:00
  • 866036a0bf Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-04 17:40:34 +02:00
  • 6387182026 Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-04 17:34:23 +02:00
  • 1d38639ca5 Working : Update to bootstrap3 mespeche 2013-09-04 17:20:34 +02:00
  • 7362a5a93b Working : Update to bootstrap3 + Delete js filter for the moment mespeche 2013-09-04 17:09:59 +02:00
  • b9577e87e3 Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-09-04 16:23:16 +02:00
  • 7b0f2ee4bc Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-09-04 16:12:22 +02:00
  • 0ea7beb70f Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-09-04 16:11:51 +02:00
  • ba645764fc Merge branch 'master' of https://github.com/thelia/thelia mespeche 2013-09-04 16:05:25 +02:00
  • 308d4d9297 WIP : Comment of route url-rewriting.check mespeche 2013-09-04 15:54:49 +02:00
  • 2cd2c6bc59 Working : Fix script reset mespeche 2013-09-04 15:52:16 +02:00
  • 02a1b5c655 Event harmonization with MRA franck 2013-09-04 15:45:46 +02:00
  • a461420c67 Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-09-04 15:45:19 +02:00
  • 62c1a59f68 WIP - Coupon create gmorel 2013-09-04 15:43:05 +02:00
  • 6cba95f4ee Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-09-04 15:42:38 +02:00
  • e3c6e960b5 Merge branch 'bootstrap3' mespeche 2013-09-04 15:35:24 +02:00
  • fec1b57aea Working : Cleanup admin new version bootstrap v3 mespeche 2013-09-04 15:34:29 +02:00
  • b910b0af86 fix URL::retrieve Etienne Roudeix 2013-09-04 15:15:38 +02:00
  • 7258b24c88 Working : Finish renaming class for bootstrap migration mespeche 2013-09-04 15:05:49 +02:00
  • f10294fee2 Merge branch 'rewrite' Etienne Roudeix 2013-09-04 14:45:57 +02:00
  • e1965a5145 global outputs in loops Etienne Roudeix 2013-09-04 14:45:14 +02:00
  • dc271db577 Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-09-04 12:01:12 +02:00
  • 3cb4e6ff2e create Address::update method in controller Manuel Raynaud 2013-09-04 11:42:18 +02:00
  • dafaa02718 Working : Major class changes migration from bootstrap 2.x to 3.0 mespeche 2013-09-04 11:35:22 +02:00
  • 1105990a41 event classes must extends ActionEvent Manuel Raynaud 2013-09-04 11:33:24 +02:00
  • ecf6326820 Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-04 10:54:19 +02:00
  • 8b2007f94d Merge branch 'actions' Manuel Raynaud 2013-09-04 10:53:32 +02:00
  • 0efe393e3c Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-09-04 10:50:13 +02:00
  • d23190303c refactor name for updating actions Manuel Raynaud 2013-09-04 10:48:59 +02:00
  • b9a7030d90 choose UPDATE word for name actions Manuel Raynaud 2013-09-04 10:37:25 +02:00
  • 4eac17fe85 Typo (sorry Etienne) franck 2013-09-04 10:32:37 +02:00
  • dad1a1c612 add update address action and create tests Manuel Raynaud 2013-09-04 10:09:51 +02:00
  • dffbf76cfd Merge branch 'master' into rewrite Etienne Roudeix 2013-09-04 10:06:22 +02:00
  • 29bf7d9a92 404 not found management Etienne Roudeix 2013-09-04 10:02:58 +02:00
  • 1b7a36addf Working Fix unset namespace mespeche 2013-09-04 09:58:59 +02:00
  • 0b9e2552ed modify travis script Manuel Raynaud 2013-09-04 08:30:24 +02:00
  • 9a537b69d3 test rewriting exception Etienne Roudeix 2013-09-04 08:16:25 +02:00
  • 26da884dae Fixed minor bug in Currencies franck 2013-09-03 19:32:57 +02:00
  • 7128739da5 Finished currency edition franck 2013-09-03 19:03:54 +02:00
  • ec32aa9eb5 Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-03 19:03:27 +02:00
  • da7fcc4274 Added route methods franck 2013-09-03 18:58:51 +02:00
  • deee59244d address action implementation Manuel Raynaud 2013-09-03 17:11:11 +02:00
  • a47ef40996 hot fix Etienne Roudeix 2013-09-03 16:57:31 +02:00
  • ac1bb60b50 Merge branch 'master' into rewrite Etienne Roudeix 2013-09-03 16:52:28 +02:00
  • 43ff0b7297 rewriting Etienne Roudeix 2013-09-03 16:51:41 +02:00
  • 5c3ac1561d add address create controller and event Manuel Raynaud 2013-09-03 16:13:17 +02:00
  • fce528c41f Added AdminUtilities Smarty plugin, optimized templates franck 2013-09-03 15:43:05 +02:00
  • 394b533dd7 update customer model createOrUpdate method Manuel Raynaud 2013-09-03 14:22:06 +02:00
  • 89edb958e5 WIP - Coupon create gmorel 2013-09-03 14:04:05 +02:00
  • 483710afd2 update address model Manuel Raynaud 2013-09-03 14:01:07 +02:00
  • 2b337229b8 Merge branch 'coupon' of https://github.com/thelia/thelia into coupon gmorel 2013-09-03 12:33:51 +02:00
  • 5bd501315d Max usage field and Is enabled field updates mespeche 2013-09-03 12:31:57 +02:00
  • 94b1e3f5ff Max usage gestion mespeche 2013-09-03 12:31:17 +02:00
  • 8a84af399d fix redirect process in viewListener Manuel Raynaud 2013-09-03 12:25:47 +02:00
  • 69f88db090 en_EN -> en_UK, the "en_EN" locale does not exists. franck 2013-09-03 11:32:13 +02:00
  • e4d59fc2e0 Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-09-03 11:28:13 +02:00
  • 55bf4868d9 Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-03 11:26:49 +02:00
  • e4c23adba6 Smarty inheritance in admin template. franck 2013-09-03 11:26:03 +02:00
  • 4088b2ef03 WIP - Coupon create gmorel 2013-09-03 11:20:20 +02:00
  • 1496f51c0e refactor reset_install script Manuel Raynaud 2013-09-03 11:14:44 +02:00
  • 56ccc2c06d Merge branch 'coupon' of https://github.com/thelia/thelia into coupon gmorel 2013-09-03 11:10:46 +02:00
  • 15a91a9fd9 refactor install process, database management in dedicated class Manuel Raynaud 2013-09-03 11:09:27 +02:00
  • 0754a1d880 Merge branch 'coupon' of https://github.com/thelia/thelia into coupon mespeche 2013-09-03 11:09:25 +02:00
  • 9f96b830e7 create task for reloaded database Manuel Raynaud 2013-09-03 11:07:32 +02:00
  • 9dc8518202 Working mespeche 2013-09-03 11:04:55 +02:00
  • 19ea6d25df WIP Merge on master gmorel 2013-09-03 11:02:36 +02:00
  • 6ee99b6cad Working - implementation Coupon Read page gmorel 2013-09-03 11:02:02 +02:00
  • 42175ca4eb Working mespeche 2013-09-03 10:45:06 +02:00
  • 1e6a31d1a3 Merge branch 'install' into reloadTask Manuel Raynaud 2013-09-03 10:30:21 +02:00
  • 2bc1dc0bec Merge branch 'master' into rewrite Etienne Roudeix 2013-09-03 10:10:32 +02:00
  • 3de03dc876 SID : rewriting Etienne Roudeix 2013-09-03 10:09:51 +02:00
  • 13ffbddc1b Merge branch 'master' into actions Manuel Raynaud 2013-09-03 09:36:54 +02:00
  • dce816d77c fix typo in phpdoc Manuel Raynaud 2013-09-03 09:22:12 +02:00
  • 29dc067076 complete test for foramt_number smarty function Manuel Raynaud 2013-09-03 09:06:02 +02:00
  • 1f50158398 test foramt_date without datetime object Manuel Raynaud 2013-09-03 08:43:00 +02:00
  • 7718c90e60 create foramt_number smarty function Manuel Raynaud 2013-09-03 08:34:46 +02:00
  • cf53e45ef0 remove sqlmap file Manuel Raynaud 2013-09-03 07:57:14 +02:00
  • 0d261373f8 add some phpdoc Manuel Raynaud 2013-09-03 00:05:37 +02:00
  • 92b64db156 complete test for format_date smarty function Manuel Raynaud 2013-09-02 23:51:51 +02:00
  • eeea885543 create new smarty function for displaying date in expected format Manuel Raynaud 2013-09-02 23:36:34 +02:00
  • 50e585044f initialize step 2 Manuel Raynaud 2013-09-02 19:56:34 +02:00
  • 73508028b4 create layout for install template Manuel Raynaud 2013-09-02 17:44:22 +02:00
  • 6383de251e Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-09-02 17:34:24 +02:00
  • 5568f2dc62 Added missing CategoryEvent class franck 2013-09-02 17:34:11 +02:00
  • 4a62419bf6 Working - fix composer.json gmorel 2013-09-02 17:30:48 +02:00
  • 384b0cd355 start to create install template Manuel Raynaud 2013-09-02 17:27:11 +02:00
  • 33b8ceb24e Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-09-02 17:25:25 +02:00
  • 347d3050f3 add missinf files Manuel Raynaud 2013-09-02 17:13:01 +02:00
  • 39d17fe30d create BaseAdminController Manuel Raynaud 2013-09-02 17:12:30 +02:00
  • 451dc93eb3 Working - Fully automatic reset script gmorel 2013-09-02 17:09:14 +02:00
  • 4b1de5fe93 WIP - Coupon Controller gmorel 2013-09-02 17:08:47 +02:00
  • ae0f2e766b Working - merge schema gmorel 2013-09-02 17:08:01 +02:00
  • c3650b4482 WIP Coupon Loop gmorel 2013-09-02 17:07:25 +02:00
  • ac5c6b9f5a create install router Manuel Raynaud 2013-09-02 16:59:10 +02:00
  • 273e6144aa Working - Add parameters to command gmorel 2013-09-02 16:57:34 +02:00