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

Commit Graph

  • 70b3f26c8c Merge remote-tracking branch 'origin/french_translation' into french_translation gmorel 2013-12-04 14:43:01 +01:00
  • f462733599 Merge gmorel 2013-11-28 22:32:39 +01:00
  • 4b034b2a61 Translation : more fre_FR added gmorel 2013-11-28 22:27:48 +01:00
  • 0f081aee23 Translation : some fre_FR added gmorel 2013-11-27 22:20:31 +01:00
  • 15d3e99ce7 Translation : some fre_FR added gmorel 2013-11-27 22:06:12 +01:00
  • 67ff253999 Translation : some fre_FR added gmorel 2013-11-27 21:27:50 +01:00
  • 31228e36c4 Translation : some fre_FR added gmorel 2013-11-27 21:15:33 +01:00
  • c7fa9fd61c Spelling rewritten with 2 t gmorel 2013-11-27 20:37:40 +01:00
  • 985c05a4a8 Merge master gmorel 2013-11-27 20:24:37 +01:00
  • 6f7f53dce4 Translation : Fix bug preventing to see error message gmorel 2013-11-27 20:11:54 +01:00
  • 00378218f9 Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-12-03 17:57:21 +01:00
  • 02aa280934 add module_include block in product-edit page Manuel Raynaud 2013-12-03 17:55:42 +01:00
  • ceb1357dd7 Renamed backoffice to backOffice Franck Allimant 2013-12-02 19:05:02 +01:00
  • 35b3f98cd8 Configure button is enabled only if module is enabled. Franck Allimant 2013-12-02 19:03:37 +01:00
  • 3e4bc0378c Fixxed assets URLs (on Windows, DS is \ !) Franck Allimant 2013-12-02 18:07:11 +01:00
  • 9b165483d9 fix tax engine instance Etienne Roudeix 2013-12-02 13:16:14 +01:00
  • a375d942ec Missing hidden field product_id for the redirection when the user click "Save" touffies 2013-11-29 09:51:10 +01:00
  • ee7d62f9d5 Extend AbstractCrudController to manage the SEO methods touffies 2013-11-29 09:50:13 +01:00
  • 4e42d0adda Merge pull request #121 from gmorel/french_translation Manuel Raynaud 2013-11-29 00:17:57 -08:00
  • 049a267ee2 Merge pull request #122 from Boyquotes/master Manuel Raynaud 2013-11-29 00:17:03 -08:00
  • 0902a195cb Fixed some translations Nicolas Villa 2013-11-29 06:38:13 +01:00
  • a801f9bfb8 Merge gmorel 2013-11-28 22:32:39 +01:00
  • 4909ecd78e Translation : more fre_FR added gmorel 2013-11-28 22:27:48 +01:00
  • d18b9a237f Merge branch 'master' of git://github.com/thelia/thelia into french_translation gmorel 2013-11-28 21:29:22 +01:00
  • 6c609e8836 Merge pull request #106 from gmorel/master Manuel Raynaud 2013-11-28 12:27:31 -08:00
  • ffc699fa7f Merge branch 'master' of git://github.com/thelia/thelia gmorel 2013-11-28 20:58:24 +01:00
  • fcde523b73 we are moving forward : no more "make it magic" Etienne Roudeix 2013-11-28 17:12:33 +01:00
  • 81fa5a291c fix tax rules issue Etienne Roudeix 2013-11-28 15:31:09 +01:00
  • a571db9a43 Hydrate SeoForm under SEO Tab touffies 2013-11-28 12:12:24 +01:00
  • dc28ce2d30 Move URL to SeoForm (SEO tab) touffies 2013-11-28 12:11:45 +01:00
  • 6418914a6d Add Action + Event to manage SEO information touffies 2013-11-28 12:10:10 +01:00
  • ad10b984f3 Add new route to save the product SEO information touffies 2013-11-28 12:07:03 +01:00
  • d13bc0579b Add action buttons at the bottom of the product General tab touffies 2013-11-28 12:06:19 +01:00
  • 1af1f90996 Add SEO tab for a product touffies 2013-11-28 12:05:03 +01:00
  • 186b338f48 Add new SEO form touffies 2013-11-28 12:03:32 +01:00
  • bc9da10d8c change asset origin param name by source Etienne Roudeix 2013-11-28 12:02:53 +01:00
  • a3beb4c6f4 Add new fields (meta_title, meta_description and meta_keyword) under I18N Product touffies 2013-11-28 12:00:07 +01:00
  • b0371312e2 assets in modules Etienne Roudeix 2013-11-28 11:47:21 +01:00
  • 247ed6aa2a Merge branch 'master' into modules Etienne Roudeix 2013-11-28 10:34:57 +01:00
  • 7e83896f96 Merge branch 'master' of github.com:thelia/thelia Etienne Roudeix 2013-11-28 10:30:28 +01:00
  • 4c754376e7 assets in module Etienne Roudeix 2013-11-28 10:30:08 +01:00
  • 94e2d7881d Merge branch 'master' of git://github.com/thelia/thelia into french_translation gmorel 2013-11-27 22:22:26 +01:00
  • ff18babbf9 Translation : some fre_FR added gmorel 2013-11-27 22:20:31 +01:00
  • 3140a8d9c8 Translation : some fre_FR added gmorel 2013-11-27 22:06:12 +01:00
  • 24e91e9ad6 Translation : some fre_FR added gmorel 2013-11-27 21:27:50 +01:00
  • b3a3cb2e8f Merge pull request #114 from thelia/email Manuel Raynaud 2013-11-27 12:25:21 -08:00
  • 476e3062e5 fix typo Manuel Raynaud 2013-11-27 21:12:17 +01:00
  • 33e0a854f2 Implemented mail messages templates and layouts Franck Allimant 2013-11-26 19:20:45 +01:00
  • e675be4cff Email template + test email touffies 2013-11-19 10:34:29 +01:00
  • 7284c485fe Translation : some fre_FR added gmorel 2013-11-27 21:15:33 +01:00
  • e7038c9369 Spelling rewritten with 2 t gmorel 2013-11-27 20:37:40 +01:00
  • dc648fef62 Merge master gmorel 2013-11-27 20:24:37 +01:00
  • 612bd1adae Translation : Fix bug preventing to see error message gmorel 2013-11-27 20:11:54 +01:00
  • 59932078fc Merge branch 'master' of git://github.com/thelia/thelia into french_translation gmorel 2013-11-27 19:16:17 +01:00
  • 1cd07603d3 Merge pull request #113 from Boyquotes/master Manuel Raynaud 2013-11-27 01:10:10 -08:00
  • b3d3d61602 add REF to product_sale_element loop and fix product tempalte Manuel Raynaud 2013-11-27 10:07:58 +01:00
  • 74b391efee Correct link "Go to admin page" alike thelia is installed in the root of virtual host or in a subdirectory Nicolas Villa 2013-11-26 18:09:48 +01:00
  • 657cd95f3b Add correct url(subdiretory included) in config page Nicolas Villa 2013-11-26 18:09:23 +01:00
  • 05c723a9ac Use getUriForPath() instead getSchemeAndHttpHost() for proper redirection for cases where Thelia is installed in a subdirectory Nicolas Villa 2013-11-26 18:08:45 +01:00
  • ef818c19ce Coupon : Add unit test for coupon removing X Amount & X Percent gmorel 2013-11-25 23:04:29 +01:00
  • d0ccfc732a Coupon : Add unit test for coupon removing X Amount & X Percent gmorel 2013-11-25 22:58:19 +01:00
  • 67a38bca20 Merge branch 'master' of git://github.com/thelia/thelia gmorel 2013-11-25 22:43:04 +01:00
  • e2db36e23b Coupon : Add unit test for coupon removing X Amount & X Percent gmorel 2013-11-25 22:42:16 +01:00
  • 2a926e5211 Coupon : Add unit test for coupon removing X Amount & X Percent gmorel 2013-11-25 22:09:40 +01:00
  • 4c3b1c5e22 Coupon : Add unit test for coupon removing X Amount & X Percent gmorel 2013-11-25 21:35:35 +01:00
  • e1bd2872d1 Merge pull request #112 from thelia/frontend Manuel Raynaud 2013-11-25 06:37:16 -08:00
  • 2549369b45 Check if store_country has a value touffies 2013-11-25 14:42:18 +01:00
  • 31ec431673 Merge pull request #111 from thelia/frontend Manuel Raynaud 2013-11-25 03:04:31 -08:00
  • 7fd7458a2d assets Etienne Roudeix 2013-11-25 11:41:59 +01:00
  • c587cc3813 Fixed double '/' in generated assets URLs Franck Allimant 2013-11-25 11:37:52 +01:00
  • a33a4cc963 Add validation for Store configuration touffies 2013-11-25 11:22:38 +01:00
  • fd0301022d Merge branch 'backoffice' into frontend touffies 2013-11-25 10:24:29 +01:00
  • 743f894a4c Merge branch 'frontend' of https://github.com/thelia/thelia into frontend touffies 2013-11-25 10:20:15 +01:00
  • b9790efeee Merge branch 'master' into modules Etienne Roudeix 2013-11-25 10:05:01 +01:00
  • 6b95d34f5a Merge branch 'master' of github.com:thelia/thelia Etienne Roudeix 2013-11-25 10:04:44 +01:00
  • 2bc1bbed64 asset tests Etienne Roudeix 2013-11-25 10:03:48 +01:00
  • 19aa1c798d Coupon : Fix namespace issues gmorel 2013-11-24 22:27:26 +01:00
  • ffbd53fceb Coupon : Fix namespace issues gmorel 2013-11-24 22:05:58 +01:00
  • c71cba93e2 Coupon : Adding unit tests gmorel 2013-11-24 21:44:51 +01:00
  • b738bde56f Coupon : Adding unit tests gmorel 2013-11-24 17:55:06 +01:00
  • 2caa9ea7bd Coupon : Adding unit tests gmorel 2013-11-24 01:07:49 +01:00
  • 469a07cdb3 Coupon : Adding unit tests gmorel 2013-11-24 00:26:16 +01:00
  • 25934b80b9 Coupon : buildCouponFromModel becomes public gmorel 2013-11-23 23:56:06 +01:00
  • 69a72cd555 Coupon : Add ability to know usage left after decremental gmorel 2013-11-23 23:23:58 +01:00
  • 20e004b9f5 Coupon : Bug fix when coupon max usage was not correctly decremented gmorel 2013-11-23 23:06:32 +01:00
  • 2884b0a3b7 Coupon : spelling gmorel 2013-11-23 22:33:30 +01:00
  • bcad9b5da1 Coupon : rename gmorel 2013-11-23 22:31:18 +01:00
  • 4447dbcd9a Coupon : Fix the error if a given coupon leads to an unknown service id gmorel 2013-11-23 22:29:15 +01:00
  • f40476e3ea Coupon not found by the factory now just return false gmorel 2013-11-23 22:15:45 +01:00
  • 23b294dcc9 Fix generated unit test stub files gmorel 2013-11-23 20:21:52 +01:00
  • 90b5fbde05 Refactor removing Manager notion gmorel 2013-11-23 20:18:04 +01:00
  • 8ce1030178 Refactor rule => condition adapter => facade gmorel 2013-11-23 18:35:21 +01:00
  • 59a04f6a09 Fix Condition comment gmorel 2013-11-23 17:51:59 +01:00
  • d276d5aa52 Fix Coupon/Condition utf8 issue gmorel 2013-11-23 17:37:48 +01:00
  • 95c4113ca8 Merge branch 'master' of git://github.com/thelia/thelia gmorel 2013-11-23 01:36:12 +01:00
  • 7f1c1bfdd8 Use Store contact information touffies 2013-11-22 17:51:35 +01:00
  • 4ef7bd4c38 Call the wrong AdminResources in saveAction touffies 2013-11-22 17:42:09 +01:00
  • 3df3379e70 Action buttons smaller touffies 2013-11-22 17:40:56 +01:00
  • 85d9c112d3 Replace company_name and contact_email by store_name & store_email touffies 2013-11-22 17:40:04 +01:00
  • 29ae2d26fe Add a new admin page to manage the basic store configurations touffies 2013-11-22 17:37:44 +01:00