Commit Graph

35 Commits

Author SHA1 Message Date
Franck Allimant
bb452c2efc Changed "Details" by "Price" 2014-01-23 15:35:52 +01:00
Manuel Raynaud
dbf0c78fa5 remove hardcoded annotation 2014-01-23 11:43:06 +01:00
Manuel Raynaud
1023790822 remove myserious annotation... 2014-01-23 11:41:15 +01:00
Manuel Raynaud
1974d3e3c3 fix psr 2014-01-22 12:52:36 +01:00
Franck Allimant
5d92ea0bab TaxManager is now a service in the container. 2014-01-22 01:18:28 +01:00
Franck Allimant
6fb448a461 Form content is now integrated in the modal body 2014-01-16 11:59:42 +01:00
Manuel Raynaud
0c24a8afc0 Merge branch 'master' into modules
Conflicts:
	templates/backOffice/default/product-edit.html
2013-12-17 10:48:59 +01:00
Manuel Raynaud
49c6b5b05a remove novalidate paramter on seo form 2013-12-16 16:26:26 +01:00
Manuel Raynaud
b9192e551c fix missing general form on seo form error 2013-12-16 16:22:14 +01:00
Manuel Raynaud
d6ba2b3d65 Merge branch 'master' into frontend 2013-12-16 15:45:04 +01:00
Etienne Roudeix
c5e69ebbb9 Merge branch 'cleanmaster' into modules 2013-12-16 10:56:40 +01:00
Etienne Roudeix
583cbe95b6 document positioning 2013-12-16 10:55:18 +01:00
Etienne Roudeix
297f197fed Merge branch 'cleanmaster' into modules 2013-12-12 15:45:45 +01:00
Etienne Roudeix
93537b8d71 in progress : reorder image 2013-12-12 15:30:10 +01:00
touffies
bc992811d4 Add new method redirectToListTemplateById 2013-12-11 21:02:12 +01:00
touffies
eae8ffe764 Merge branch 'frontend' of https://github.com/thelia/thelia into frontend 2013-12-11 18:53:42 +01:00
touffies
f1530fa6f9 Display error message if exist (INCLUDE notifications.html) 2013-12-11 18:53:17 +01:00
touffies
8c20202778 Add dismissable 2013-12-11 18:13:28 +01:00
Etienne Roudeix
02b9d2e509 Merge branch 'cleanmaster' into modules 2013-12-10 15:57:37 +01:00
Manuel Raynaud
462b2bec5e Merge branch 'master' into frontend
Conflicts:
	templates/backOffice/default/folder-edit.html
2013-12-09 16:15:58 +01:00
gmorel
83356ab867 Fix typo 2013-12-09 15:19:15 +01:00
touffies
d476672150 Add SEO Meta to CATEGORY/PRODUCT/FOLDER/CONTENT 2013-12-09 15:00:51 +01:00
touffies
2d9e2df5a4 Missing hidden field product_id for the redirection when the user click "Save" 2013-12-09 14:52:44 +01:00
touffies
9d88552492 Add action buttons at the bottom of the product General tab 2013-12-09 14:49:20 +01:00
touffies
ba48bc985e Add SEO tab for a product 2013-12-09 14:46:07 +01:00
Franck Allimant
8c864021f5 Added sorting and position ùmanagement to modules. 2013-12-06 18:59:46 +01:00
Franck Allimant
e96088080d Merge branch 'master' into modules 2013-12-06 17:16:14 +01:00
Franck Allimant
1416265053 Fixed improper translations 2013-12-05 11:05:08 +01:00
Franck Allimant
35b3f98cd8 Configure button is enabled only if module is enabled. 2013-12-02 19:03:37 +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
touffies
3df3379e70 Action buttons smaller 2013-11-22 17:40:56 +01:00
Etienne Roudeix
87b25b922e configure button in module page 2013-11-15 12:19:06 +01:00
Etienne Roudeix
299b192018 Colissimo module + countires areas 2013-11-14 09:13:28 +01:00
Etienne Roudeix
25192cf366 change template subdirs 2013-11-13 10:24:14 +01:00