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

Commit Graph

  • 6d5f34767d refactor document events Manuel Raynaud 2013-09-30 10:32:48 +02:00
  • 7bf5ee31c9 Merge branch 'refactor_action' Manuel Raynaud 2013-09-30 10:26:59 +02:00
  • ed335847ce No options extend mespeche 2013-09-30 10:23:39 +02:00
  • 6c5e348b46 refactor missing product event Manuel Raynaud 2013-09-30 10:18:02 +02:00
  • 01dbe9f5d2 refactor feature events Manuel Raynaud 2013-09-30 10:16:57 +02:00
  • 1c2532fe6a refactor cart events Manuel Raynaud 2013-09-30 10:15:22 +02:00
  • 2a6c50c865 Merge branch 'views-management' of https://github.com/thelia/thelia into views-management mespeche 2013-09-30 10:14:11 +02:00
  • 10022e5a4a refactor currency events Manuel Raynaud 2013-09-30 10:11:55 +02:00
  • 3ed76d237a refactor config events Manuel Raynaud 2013-09-30 10:10:44 +02:00
  • cf4d3b87fd refactor category events Manuel Raynaud 2013-09-30 10:09:43 +02:00
  • 0ce4b25e72 refactor customer events Manuel Raynaud 2013-09-30 10:07:01 +02:00
  • b023c33cc7 refactor address and attribute events Manuel Raynaud 2013-09-30 10:03:14 +02:00
  • efb5a7a54d refactor message events Manuel Raynaud 2013-09-30 10:01:06 +02:00
  • 80071b6dd1 refactor template events Manuel Raynaud 2013-09-30 09:59:39 +02:00
  • 2928d0d3c0 update import using propel collection in all save methods Manuel Raynaud 2013-09-30 09:31:34 +02:00
  • 0878659368 update import using isDefault parameter on productSaleElements Manuel Raynaud 2013-09-30 09:25:48 +02:00
  • 43238103c7 Start selectbox in modal to choose country mespeche 2013-09-30 09:17:59 +02:00
  • cbf0d19dcd Refonte du code javascript pour mieux gérer le drag and drop, maintenant il faudrait ajouter un peu de css. touffies 2013-09-27 17:23:08 +02:00
  • a74cf0aa85 WIP : Coupon : Fix condition edition gmorel 2013-09-27 15:57:56 +02:00
  • f9bffe9025 fix template Etienne Roudeix 2013-09-27 15:23:35 +02:00
  • 5abe350b65 WIP : Coupon : Fix condition selection JS + Dependency Injection register gmorel 2013-09-27 14:52:38 +02:00
  • 61d9e89f2e schema fix Etienne Roudeix 2013-09-27 13:38:23 +02:00
  • a647bfd016 Merge branch 'master' into tax Etienne Roudeix 2013-09-27 13:35:39 +02:00
  • fbcd6b0cd2 update readme Manuel Raynaud 2013-09-27 13:32:57 +02:00
  • 4735c232db Merge pull request #2 from thelia/coupon Manuel Raynaud 2013-09-27 04:21:50 -07:00
  • bce83ea5c0 Test commit with coda touffies 2013-09-27 12:32:16 +02:00
  • a82d671d4a Change dragging containment touffies 2013-09-27 11:59:35 +02:00
  • 7b3e7ece4d Merge branch 'master' into tax Etienne Roudeix 2013-09-27 11:06:16 +02:00
  • ab6e34cf00 Merge branch 'template' Etienne Roudeix 2013-09-27 11:04:52 +02:00
  • f60670c412 translations intl Etienne Roudeix 2013-09-27 11:04:14 +02:00
  • 1766951389 Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-09-27 10:39:52 +02:00
  • 9d02aa75a8 Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-09-27 10:37:09 +02:00
  • 622e1ca3b6 Merge branch 'master' into tax Etienne Roudeix 2013-09-27 10:29:51 +02:00
  • c8e56625ad Working : upload file/image : fix sanitizeFileName gmorel 2013-09-27 10:21:49 +02:00
  • 116c8c31b4 Merge branch 'master' of https://github.com/thelia/thelia gmorel 2013-09-27 10:20:02 +02:00
  • 7e3cbb6818 fix tests (or not ?) Etienne Roudeix 2013-09-27 10:03:56 +02:00
  • abdd154479 Working : upload file/image : fix sanitizeFileName gmorel 2013-09-27 10:00:39 +02:00
  • 0c2a0f8053 call reset_install script in travis Etienne Roudeix 2013-09-27 09:50:28 +02:00
  • 4bdc06e216 try to fix test Etienne Roudeix 2013-09-27 09:30:22 +02:00
  • 6840ad362e Taxe Rules : Modification du javascript Drag & Drop pour ordonner les éléments. macuser 2013-09-27 01:38:26 +02:00
  • 62ce7db882 Merge branch 'catalog' franck 2013-09-26 19:07:06 +02:00
  • dde8501790 WIP : coupon refactor + fix gmorel 2013-09-26 18:18:45 +02:00
  • a1f898ff3b Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-09-26 17:48:06 +02:00
  • fbf7ee1625 WIP : coupon refactor + fix gmorel 2013-09-26 17:47:50 +02:00
  • 73fde64f5b WIP : coupon refactor + fix gmorel 2013-09-26 17:47:41 +02:00
  • 0cdd960cb1 Working : images : enhance display gmorel 2013-09-26 15:26:45 +02:00
  • be4c6380e7 Setting taxe rule drag and drop functionnal with sortable rule group mespeche 2013-09-26 15:24:31 +02:00
  • 49da6b1a3b Merge branch 'master' into tax Etienne Roudeix 2013-09-26 14:18:44 +02:00
  • 97c461fa2c order address changes tests Etienne Roudeix 2013-09-26 14:17:26 +02:00
  • c521fb2696 WIP : Condition : refactor name gmorel 2013-09-26 14:12:59 +02:00
  • 9ceddf4870 WIP : Condition : refactor name gmorel 2013-09-26 14:12:53 +02:00
  • f5492ed2f9 tests for order update actions Etienne Roudeix 2013-09-26 13:25:25 +02:00
  • 34ef5cf524 edit order form Etienne Roudeix 2013-09-26 13:07:51 +02:00
  • 5e0f9cedf5 fix tests Etienne Roudeix 2013-09-26 10:43:09 +02:00
  • 4d3335f589 WIP : Condition : Fix unit text gmorel 2013-09-25 18:15:48 +02:00
  • 3a7a76afe0 move folders action class to Folder directory Manuel Raynaud 2013-09-25 17:53:38 +02:00
  • a8a8ecb38c refactor product events, moving to Prduct folder Manuel Raynaud 2013-09-25 17:50:29 +02:00
  • 965a505864 WIP : Condition : Fix unit text gmorel 2013-09-25 17:47:42 +02:00
  • 0da90c4a99 WIP : Condition : Fix unit text gmorel 2013-09-25 17:22:36 +02:00
  • 45fabcfdd6 WIP : Refactor contraint/rule becomes conditions (more generic) gmorel 2013-09-25 16:47:01 +02:00
  • c10074786d Merge branches 'coupon' and 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-09-25 16:40:54 +02:00
  • b7851b2d54 WIP : Refactor contraint/rule becomes conditions (more generic) gmorel 2013-09-25 16:36:14 +02:00
  • 24467edd29 Merge branch 'master' into tax Etienne Roudeix 2013-09-25 15:58:43 +02:00
  • 1ffcaa7dd4 order admin Etienne Roudeix 2013-09-25 15:55:48 +02:00
  • d6172f23cf WIP : Refactor contraint/rule becomes conditions (more generic) gmorel 2013-09-25 14:51:42 +02:00
  • d967242a59 order admin Etienne Roudeix 2013-09-25 13:26:12 +02:00
  • cb389f126c WIP : Refactor contraint/rule becomes conditions (more generic) gmorel 2013-09-25 12:58:12 +02:00
  • 451f79be1a Merge branch 'coupon' of https://github.com/thelia/thelia into coupon gmorel 2013-09-25 09:27:21 +02:00
  • dcd7d6dd4f Merge branch 'upload_management' of https://github.com/thelia/thelia into catalog gmorel 2013-09-25 09:26:05 +02:00
  • 8b5c3820d5 Merge branch 'catalog' of https://github.com/thelia/thelia into catalog gmorel 2013-09-25 09:25:28 +02:00
  • 9c80120383 fix missing } in password template Manuel Raynaud 2013-09-25 08:01:27 +02:00
  • 033bebdd30 Working : coupon creation : Fix js gmorel 2013-09-24 22:46:54 +02:00
  • cef3787d68 Working : Fix : Unit test gmorel 2013-09-24 19:06:10 +02:00
  • 87016ddddb Working : Fix : Unit test gmorel 2013-09-24 18:54:38 +02:00
  • dc17f89729 Merge branch 'catalog' of https://github.com/thelia/thelia into upload_management gmorel 2013-09-24 18:41:57 +02:00
  • 7f3367f590 Working : Fix : Image Management + Document Management gmorel 2013-09-24 18:41:28 +02:00
  • 7bd511c420 order admin Etienne Roudeix 2013-09-24 17:04:32 +02:00
  • 71888e68aa Working : FileManager :Add some more unit tests gmorel 2013-09-24 14:50:42 +02:00
  • b0a357d222 Setting Taxes rules management default view mespeche 2013-09-24 13:12:52 +02:00
  • 430e18e4e2 Working : Add a link on documents gmorel 2013-09-24 12:25:19 +02:00
  • 0c769a3398 Working : fix url document + refactor : naming conventions gmorel 2013-09-24 12:24:40 +02:00
  • 17e312ca23 Working : refactor : naming conventions gmorel 2013-09-24 12:13:25 +02:00
  • 4600727163 order admin Etienne Roudeix 2013-09-24 12:10:22 +02:00
  • 466113bc12 Working : upload : fix unit test gmorel 2013-09-24 11:11:50 +02:00
  • 084f66589a WIP : upload documents : add action, ctrl, event gmorel 2013-09-24 10:54:52 +02:00
  • 93e7a4dc90 order admin integration Etienne Roudeix 2013-09-24 09:44:59 +02:00
  • cf8af9c1bb Setting dropdown menu on orders item mespeche 2013-09-24 09:41:15 +02:00
  • 1f54a288fc Setting admin profile creation (route, view, form) mespeche 2013-09-24 09:36:48 +02:00
  • b7c8c7584d Merge branch 'master' into tax Etienne Roudeix 2013-09-24 09:15:52 +02:00
  • fbd91c1925 add admin templates Etienne Roudeix 2013-09-24 09:15:41 +02:00
  • d004e0411e remove smarty cache Manuel Raynaud 2013-09-24 08:17:46 +02:00
  • 1e571ffbc5 Merge branch 'content' Manuel Raynaud 2013-09-23 23:35:05 +02:00
  • d0f20cca1d Working : coupon creation : add default rule (thelia.constraint.rule.available_for_everyone) gmorel 2013-09-23 23:04:00 +02:00
  • e4658d2fa2 Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-09-23 21:03:26 +02:00
  • 8d61a9222e Merge branch 'catalog' of https://github.com/thelia/thelia into catalog franck 2013-09-23 18:37:33 +02:00
  • 67bf7bb989 Finished product combination basic function franck 2013-09-23 18:36:55 +02:00
  • 695b2b4d94 Merge branch 'catalog' of https://github.com/thelia/thelia into upload_management gmorel 2013-09-23 18:15:24 +02:00
  • 9ee8b2b75f WIP : upload document : add forms gmorel 2013-09-23 18:13:12 +02:00
  • ce7a9eccfc Working : upload image : fix return URL to images tab gmorel 2013-09-23 17:28:11 +02:00
  • 4e8f4061af Merge branch 'catalog' of https://github.com/thelia/thelia into catalog franck 2013-09-23 17:26:28 +02:00