Commit Graph

2765 Commits

Author SHA1 Message Date
Franck Allimant
35b3f98cd8 Configure button is enabled only if module is enabled. 2013-12-02 19:03:37 +01:00
Franck Allimant
3e4bc0378c Fixxed assets URLs (on Windows, DS is \ !) 2013-12-02 18:07:11 +01:00
Etienne Roudeix
9b165483d9 fix tax engine instance 2013-12-02 13:16:14 +01:00
touffies
a375d942ec Missing hidden field product_id for the redirection when the user click "Save" 2013-11-29 09:51:10 +01:00
touffies
ee7d62f9d5 Extend AbstractCrudController to manage the SEO methods 2013-11-29 09:50:13 +01:00
Manuel Raynaud
4e42d0adda Merge pull request #121 from gmorel/french_translation
French translation
2013-11-29 00:17:57 -08:00
Manuel Raynaud
049a267ee2 Merge pull request #122 from Boyquotes/master
Fixed some translations
2013-11-29 00:17:03 -08:00
Nicolas Villa
0902a195cb Fixed some translations 2013-11-29 06:38:13 +01:00
gmorel
a801f9bfb8 Merge 2013-11-28 22:32:39 +01:00
gmorel
4909ecd78e Translation : more fre_FR added 2013-11-28 22:27:48 +01:00
gmorel
d18b9a237f Merge branch 'master' of git://github.com/thelia/thelia into french_translation
* 'master' of git://github.com/thelia/thelia: (23 commits)
  Coupon : Add unit test for coupon removing X Amount & X Percent
  Coupon : Add unit test for coupon removing X Amount & X Percent
  Coupon : Add unit test for coupon removing X Amount & X Percent
  Coupon : Add unit test for coupon removing X Amount & X Percent
  Coupon : Add unit test for coupon removing X Amount & X Percent
  Coupon : Fix namespace issues
  Coupon : Fix namespace issues
  Coupon : Adding unit tests
  Coupon : Adding unit tests
  Coupon : Adding unit tests
  Coupon : Adding unit tests
  Coupon : buildCouponFromModel becomes public
  Coupon : Add ability to know usage left after decremental
  Coupon : Bug fix when coupon max usage was not correctly decremented
  Coupon : spelling
  Coupon : rename
  Coupon : Fix the error if a given coupon leads to an unknown service id
  Coupon not found by the factory now just return false
  Fix generated unit test stub files
  Refactor removing Manager notion
  ...
2013-11-28 21:29:22 +01:00
Manuel Raynaud
6c609e8836 Merge pull request #106 from gmorel/master
Condition Module - adding/refactor unit tests
2013-11-28 12:27:31 -08:00
gmorel
ffc699fa7f Merge branch 'master' of git://github.com/thelia/thelia
* 'master' of git://github.com/thelia/thelia:
  fix typo
  Implemented mail messages templates and layouts
  Email template + test email
  add REF to product_sale_element loop and fix product tempalte
  Correct link "Go to admin page" alike thelia is installed in the root of virtual host or in a subdirectory
  Add correct url(subdiretory included) in config page
  Use getUriForPath() instead getSchemeAndHttpHost() for proper redirection for cases where Thelia is installed in a subdirectory
2013-11-28 20:58:24 +01:00
Etienne Roudeix
fcde523b73 we are moving forward : no more "make it magic" 2013-11-28 17:12:33 +01:00
Etienne Roudeix
81fa5a291c fix tax rules issue 2013-11-28 15:31:09 +01:00
touffies
a571db9a43 Hydrate SeoForm under SEO Tab 2013-11-28 12:12:24 +01:00
touffies
dc28ce2d30 Move URL to SeoForm (SEO tab) 2013-11-28 12:11:45 +01:00
touffies
6418914a6d Add Action + Event to manage SEO information 2013-11-28 12:10:10 +01:00
touffies
ad10b984f3 Add new route to save the product SEO information 2013-11-28 12:07:03 +01:00
touffies
d13bc0579b Add action buttons at the bottom of the product General tab 2013-11-28 12:06:19 +01:00
touffies
1af1f90996 Add SEO tab for a product 2013-11-28 12:05:03 +01:00
touffies
186b338f48 Add new SEO form 2013-11-28 12:03:32 +01:00
Etienne Roudeix
bc9da10d8c change asset origin param name by source 2013-11-28 12:02:53 +01:00
touffies
a3beb4c6f4 Add new fields (meta_title, meta_description and meta_keyword) under I18N Product 2013-11-28 12:02:25 +01:00
Etienne Roudeix
b0371312e2 assets in modules 2013-11-28 11:47:21 +01:00
Etienne Roudeix
247ed6aa2a Merge branch 'master' into modules
Conflicts:
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
2013-11-28 10:34:57 +01:00
Etienne Roudeix
7e83896f96 Merge branch 'master' of github.com:thelia/thelia 2013-11-28 10:30:28 +01:00
Etienne Roudeix
4c754376e7 assets in module 2013-11-28 10:30:08 +01:00
gmorel
94e2d7881d Merge branch 'master' of git://github.com/thelia/thelia into french_translation
* 'master' of git://github.com/thelia/thelia:
  fix typo
  Implemented mail messages templates and layouts
  Email template + test email
2013-11-27 22:22:26 +01:00
gmorel
ff18babbf9 Translation : some fre_FR added 2013-11-27 22:20:31 +01:00
gmorel
3140a8d9c8 Translation : some fre_FR added 2013-11-27 22:06:12 +01:00
gmorel
24e91e9ad6 Translation : some fre_FR added 2013-11-27 21:27:50 +01:00
Manuel Raynaud
b3a3cb2e8f Merge pull request #114 from thelia/email
Email
2013-11-27 12:25:21 -08:00
Manuel Raynaud
476e3062e5 fix typo 2013-11-27 21:21:07 +01:00
Franck Allimant
33e0a854f2 Implemented mail messages templates and layouts 2013-11-27 21:21:07 +01:00
touffies
e675be4cff Email template + test email 2013-11-27 21:19:27 +01:00
gmorel
7284c485fe Translation : some fre_FR added 2013-11-27 21:15:33 +01:00
gmorel
e7038c9369 Spelling rewritten with 2 t 2013-11-27 20:37:40 +01:00
gmorel
dc648fef62 Merge master 2013-11-27 20:24:38 +01:00
gmorel
612bd1adae Translation : Fix bug preventing to see error message 2013-11-27 20:11:54 +01:00
gmorel
59932078fc Merge branch 'master' of git://github.com/thelia/thelia into french_translation
* 'master' of git://github.com/thelia/thelia:
  add REF to product_sale_element loop and fix product tempalte
  Correct link "Go to admin page" alike thelia is installed in the root of virtual host or in a subdirectory
  Add correct url(subdiretory included) in config page
  Use getUriForPath() instead getSchemeAndHttpHost() for proper redirection for cases where Thelia is installed in a subdirectory
  Check if store_country has a value
  Fixed double '/' in generated assets URLs
  Add validation for Store configuration
  Use Store contact information
  Call the wrong AdminResources in saveAction
  Action buttons smaller
  Replace company_name and contact_email by store_name & store_email
  Add a new admin page to manage the basic store configurations
  Add routing for Store Configuration
  Add argument Title on Content Loop & Folder Loop
2013-11-27 19:16:17 +01:00
Manuel Raynaud
1cd07603d3 Merge pull request #113 from Boyquotes/master
Correct link during the installation process and config url website
2013-11-27 01:10:10 -08:00
Manuel Raynaud
b3d3d61602 add REF to product_sale_element loop and fix product tempalte 2013-11-27 10:07:58 +01:00
Nicolas Villa
74b391efee Correct link "Go to admin page" alike thelia is installed in the root of virtual host or in a subdirectory 2013-11-26 18:09:48 +01:00
Nicolas Villa
657cd95f3b Add correct url(subdiretory included) in config page 2013-11-26 18:09:23 +01:00
Nicolas Villa
05c723a9ac Use getUriForPath() instead getSchemeAndHttpHost() for proper redirection for cases where Thelia is installed in a subdirectory 2013-11-26 18:08:45 +01:00
gmorel
ef818c19ce Coupon : Add unit test for coupon removing X Amount & X Percent 2013-11-25 23:04:29 +01:00
gmorel
d0ccfc732a Coupon : Add unit test for coupon removing X Amount & X Percent 2013-11-25 22:58:19 +01:00
gmorel
67a38bca20 Merge branch 'master' of git://github.com/thelia/thelia
* 'master' of git://github.com/thelia/thelia:
  Check if store_country has a value
  Fixed double '/' in generated assets URLs
  Add validation for Store configuration
  Use Store contact information
  Call the wrong AdminResources in saveAction
  Action buttons smaller
  Replace company_name and contact_email by store_name & store_email
  Add a new admin page to manage the basic store configurations
  Add routing for Store Configuration
  Add argument Title on Content Loop & Folder Loop
2013-11-25 22:43:04 +01:00
gmorel
e2db36e23b Coupon : Add unit test for coupon removing X Amount & X Percent 2013-11-25 22:42:16 +01:00