Commit Graph

  • 21e6f3471c Working : upload image : fix fallback and delete links on refresh gmorel 2013-09-23 17:25:31 +02:00
  • 780c6b3483 Merge branch 'catalog' of https://github.com/thelia/thelia into catalog franck 2013-09-23 17:11:09 +02:00
  • 1b81f8725a Formatted combination table franck 2013-09-23 17:10:33 +02:00
  • 3cb7289848 Merge branches 'catalog' and 'upload_management' of https://github.com/thelia/thelia into catalog gmorel 2013-09-23 17:10:03 +02:00
  • 645ff15fcf Impemented combination creation franck 2013-09-23 17:03:36 +02:00
  • 7aed1b6707 Merge remote-tracking branch 'origin/upload_management' into upload_management gmorel 2013-09-23 16:54:34 +02:00
  • 9da50760b5 Working : Upload image : Fix upload validation gmorel 2013-09-23 16:52:50 +02:00
  • ddabf3fcbc - Image format allowed - manual-reverse order on image loop mespeche 2013-09-23 15:26:52 +02:00
  • 3b397bed47 Upload allow only for images mespeche 2013-09-23 15:18:13 +02:00
  • 2360d145d6 Merge branch 'upload_management' of https://github.com/thelia/thelia into upload_management mespeche 2013-09-23 15:12:02 +02:00
  • 82be007dde Hide upload zone during upload mespeche 2013-09-23 15:11:21 +02:00
  • 533c4f743a Merge branch 'template' Etienne Roudeix 2013-09-23 15:00:39 +02:00
  • 2de820f576 order tests Etienne Roudeix 2013-09-23 15:00:13 +02:00
  • e39511e3dc Working : Upload image : Fix unit tests gmorel 2013-09-23 14:55:36 +02:00
  • 5bbf693e0f action order tests Etienne Roudeix 2013-09-23 14:44:52 +02:00
  • d0376d31f9 Working : Upload image : set product image form loaded via ajax, fix category, folder, content gmorel 2013-09-23 14:42:23 +02:00
  • ac35f1f6fd Merge branch 'upload_management' of https://github.com/thelia/thelia into upload_management gmorel 2013-09-23 12:42:12 +02:00
  • 4f78af4f3b WIP : Upload image : set product image form loaded via ajax gmorel 2013-09-23 12:42:02 +02:00
  • fea156635d allow to delete content Manuel Raynaud 2013-09-23 12:40:01 +02:00
  • dfa162d53b Setting tinymce mespeche 2013-09-23 12:38:24 +02:00
  • 144864de09 Merge branch 'upload_management' of https://github.com/thelia/thelia into upload_management mespeche 2013-09-23 12:31:01 +02:00
  • 1ea614be57 Update uploader view Update image edit view mespeche 2013-09-23 12:30:34 +02:00
  • 19782f6852 Merge branch 'catalog' of https://github.com/thelia/thelia into upload_management gmorel 2013-09-23 12:27:36 +02:00
  • 7bc34d3d0f toofle content visibility Manuel Raynaud 2013-09-23 12:08:59 +02:00
  • c1d89e85c9 Working : Upload management : on content gmorel 2013-09-23 11:57:19 +02:00
  • b02feefc33 Merge branch 'master' of https://github.com/thelia/thelia into upload_management gmorel 2013-09-23 11:55:24 +02:00
  • 5846a5f288 Working : Upload management : on folder, category, product gmorel 2013-09-23 11:55:02 +02:00
  • 74fde51d96 allow to load jquery offline Manuel Raynaud 2013-09-23 11:44:05 +02:00
  • e7974a21a7 Finished combination creation GUI franck 2013-09-23 11:41:14 +02:00
  • 49f79071a6 allow update content position number Manuel Raynaud 2013-09-23 11:39:53 +02:00
  • d015c8c3b8 cache dataccessfunctions Etienne Roudeix 2013-09-23 11:24:30 +02:00
  • 194073fa42 order action test Etienne Roudeix 2013-09-23 11:12:41 +02:00
  • 7c563eda42 Working : Upload management : fix e.preventDefault in chrome and safari gmorel 2013-09-23 10:33:36 +02:00
  • 44dc4dbcc8 Setting creation form language mespeche 2013-09-23 10:22:14 +02:00
  • 0eabcb4f28 Setting languages view and route mespeche 2013-09-23 09:55:54 +02:00
  • 915516e679 Put curresncy selector in toolbar franck 2013-09-23 01:22:54 +02:00
  • 8781721512 Started price tab franck 2013-09-23 00:57:03 +02:00
  • 22f3f49f79 Finished product multiple categories attachment franck 2013-09-22 22:14:39 +02:00
  • b91a11536b Working : Image management set on Category gmorel 2013-09-22 20:50:42 +02:00
  • ac435b8f87 fire event on insert content in createmethod Manuel Raynaud 2013-09-21 17:04:05 +02:00
  • 04e0da56e7 fix issue, default foler is set on content creation Manuel Raynaud 2013-09-21 16:58:38 +02:00
  • 72a2cdfd75 Ajaxified product modification tabs franck 2013-09-21 16:51:51 +02:00
  • 4e3768e0e9 allow to create new content Manuel Raynaud 2013-09-21 16:38:22 +02:00
  • 1da66ece29 update default param of content model Manuel Raynaud 2013-09-21 16:07:25 +02:00
  • f44b7daf8c create content listener for crud management Manuel Raynaud 2013-09-21 15:32:27 +02:00
  • 7680fb42cc dispatch event in pre/post crud method for content model Manuel Raynaud 2013-09-21 15:24:44 +02:00
  • 849c7dd20b display content modification page Manuel Raynaud 2013-09-21 15:20:06 +02:00
  • cf7e6d6952 Merge branch 'master' of https://github.com/thelia/thelia into upload_management gmorel 2013-09-21 14:44:57 +02:00
  • 4ec55e5aca create contentUpdateEvent Manuel Raynaud 2013-09-21 14:40:35 +02:00
  • 09abedeb9f create contentCreateEvent Manuel Raynaud 2013-09-21 14:37:20 +02:00
  • 444cee8e82 create ContentEvent Manuel Raynaud 2013-09-21 14:35:01 +02:00
  • 423860932f create contentModificationForm Manuel Raynaud 2013-09-21 14:32:01 +02:00
  • bb9e1d6999 Finished product features management franck 2013-09-21 14:14:56 +02:00
  • 52efd79fb5 create content controller Manuel Raynaud 2013-09-21 14:10:08 +02:00
  • bb796f08b6 change folder_id parm by parent in list folder view Manuel Raynaud 2013-09-21 13:55:12 +02:00
  • 962081c17d use placeholder in folder update route Manuel Raynaud 2013-09-21 13:42:00 +02:00
  • e3644cd6cc Aded feature_template and category_template position management franck 2013-09-21 11:46:09 +02:00
  • f6530f0bfc Finished product feature values franck 2013-09-20 23:10:31 +02:00
  • cc2a3914a9 implement process for changing folder position Manuel Raynaud 2013-09-20 20:38:39 +02:00
  • abac607534 allow possibility to change folder visibility Manuel Raynaud 2013-09-20 20:23:49 +02:00
  • a8dddc9c26 allow to create folder Manuel Raynaud 2013-09-20 20:07:59 +02:00
  • aa39d6300c add dispatcher before/after for folder crud management Manuel Raynaud 2013-09-20 19:57:25 +02:00
  • 56197a739e icreate folder delete event Manuel Raynaud 2013-09-20 19:49:12 +02:00
  • 6a1df0240e process folder update action Manuel Raynaud 2013-09-20 19:34:36 +02:00
  • 00f7c491b2 create folder events Manuel Raynaud 2013-09-20 19:00:41 +02:00
  • 8a37636aa6 display info in folders edition template Manuel Raynaud 2013-09-20 18:39:12 +02:00
  • 805b38ab9a Merge branch 'master' into content Manuel Raynaud 2013-09-20 17:41:38 +02:00
  • 1cf8c87d1a Fixed product update process franck 2013-09-20 17:17:44 +02:00
  • 369b7e1be1 Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-09-20 17:15:07 +02:00
  • b7af3ebaa3 push model Etienne Roudeix 2013-09-20 17:02:19 +02:00
  • bf11fa1958 re-add home link in menu Manuel Raynaud 2013-09-20 16:56:23 +02:00
  • ced7b5e6dc WIP : Upload management (upload+save+delete done) need to finish integration and add all image fields gmorel 2013-09-20 16:51:34 +02:00
  • defaadcd62 Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-09-20 16:50:03 +02:00
  • 44d6bbdb4a comment dev menu in layout Manuel Raynaud 2013-09-20 16:48:37 +02:00
  • c05496af53 Merge branch 'master' into template Etienne Roudeix 2013-09-20 16:32:42 +02:00
  • d74fc0e1d3 Merge branch 'master' of github.com:thelia/thelia Etienne Roudeix 2013-09-20 16:32:32 +02:00
  • 1a962d701d translate some missing string Manuel Raynaud 2013-09-20 16:31:25 +02:00
  • 61191b9d32 fixes order integration Etienne Roudeix 2013-09-20 16:31:19 +02:00
  • 8541499302 order process Etienne Roudeix 2013-09-20 16:25:46 +02:00
  • eab7cd9fa8 Password type on password field mespeche 2013-09-20 16:12:49 +02:00
  • 7e081d99e4 Creation of mailing system configuration variables management view mespeche 2013-09-20 16:10:53 +02:00
  • 5622a246b2 Added missing files franck 2013-09-20 15:59:19 +02:00
  • e27b3cfbae Working catalog branch franck 2013-09-20 15:54:50 +02:00
  • 4e6aac8917 Merge branch 'integration' Manuel Raynaud 2013-09-20 14:39:00 +02:00
  • 30d02799b2 Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-09-20 14:38:46 +02:00
  • 2cf71f99a9 change some informations in layou Manuel Raynaud 2013-09-20 14:38:11 +02:00
  • 1649e4d76b fix query in Thelia\Model\Folder::countAllContents Manuel Raynaud 2013-09-20 14:26:36 +02:00
  • bb40086e2a allow to order products on category page Manuel Raynaud 2013-09-20 13:59:51 +02:00
  • 265da6a57e Add default language & editing language default field mespeche 2013-09-20 12:00:39 +02:00
  • 93fd189198 Merge branch 'master' of https://github.com/thelia/thelia mespeche 2013-09-20 10:39:34 +02:00
  • b933a96c8e Vertical align middle tables mespeche 2013-09-20 10:39:02 +02:00
  • cb5f6d4c70 Fixed translations franck 2013-09-20 09:57:30 +02:00
  • 93abd3387c Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-20 09:39:26 +02:00
  • f7d2c09c6d Added producr attributes routes franck 2013-09-20 09:38:48 +02:00
  • 5abae4db7d Setting profile update mespeche 2013-09-20 09:35:56 +02:00
  • 16de9bbcc9 allow displaying how much product wanted in category page Manuel Raynaud 2013-09-20 09:19:12 +02:00
  • c255548d9b create dedicated file for menu Manuel Raynaud 2013-09-20 08:45:38 +02:00
  • 17548e3526 order tax tables Etienne Roudeix 2013-09-20 08:23:02 +02:00
  • acffa60e50 awesome menu created in front office Manuel Raynaud 2013-09-20 08:05:44 +02:00
  • 8e308d21e9 Working : Coupon : fix update effect (becomes type), update max usage gmorel 2013-09-19 23:25:01 +02:00