Commit Graph

183 Commits

Author SHA1 Message Date
Manuel Raynaud
412e5e9253 comment missing js file 2013-12-14 15:19:34 +01:00
Manuel Raynaud
48e31b1145 fix link in admin footer 2013-12-14 13:27:09 +01:00
Etienne Roudeix
297f197fed Merge branch 'cleanmaster' into modules 2013-12-12 15:45:45 +01:00
Etienne Roudeix
c9e052188c images are positionable 2013-12-12 15:41:35 +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
890f52da54 Add hidden field category_id 2013-12-11 20:56:04 +01:00
touffies
7eca83889a Merge branch 'master' into frontend 2013-12-11 18:54:50 +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
28e70787ab Define close_url 2013-12-11 18:47:30 +01:00
touffies
b46a8fd1f2 Define close_url variable 2013-12-11 18:43:43 +01:00
touffies
01850c7d17 - Define close_url
- Use notifications.html
2013-12-11 18:33:03 +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
gmorel
60cb9cd52b Fix typo : attributes = déclinaisons 2013-12-10 11:00:55 +01:00
touffies
f51d540950 Wrong Form Action for SEO 2013-12-09 16:45:06 +01:00
Manuel Raynaud
eca8b01fb6 revert last conflic 2013-12-09 16:18:59 +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
80eb4b7bd0 Adding translation for Backoffice 2013-12-09 15:19:15 +01:00
gmorel
c110e4e812 Adding translation for Backoffice 2013-12-09 15:19:15 +01:00
gmorel
601aaf311d Adding translation for Backoffice 2013-12-09 15:19:15 +01:00
gmorel
b8b6887fea Fix typo 2013-12-09 15:19:15 +01:00
gmorel
f31ed34ee3 Fix typo 2013-12-09 15:19:15 +01:00
gmorel
fcb626e784 Fix typo 2013-12-09 15:19:15 +01:00
gmorel
7f33c86d75 Adding translation for Backoffice 2013-12-09 15:19:15 +01:00
gmorel
83356ab867 Fix typo 2013-12-09 15:19:15 +01:00
gmorel
5f833f256f Adding translation for Backoffice 2013-12-09 15:19:15 +01:00
gmorel
d658351343 Fix typo 2013-12-09 15:19:15 +01:00
gmorel
ae88efd282 Adding translation for Backoffice 2013-12-09 15:19:15 +01:00
gmorel
a064489fe4 Adding translation for Backoffice 2013-12-09 15:19:15 +01:00
gmorel
502a171c0d Adding translation for Backoffice 2013-12-09 15:19:15 +01:00
gmorel
d769f51186 Fix typo 2013-12-09 15:19:14 +01:00
gmorel
8ba353dd6c Adding translation for Backoffice 2013-12-09 15:19:14 +01:00
gmorel
0d69d226f3 Adding translation for Backoffice 2013-12-09 15:19:14 +01:00
gmorel
80d1656762 Adding translation for Backoffice 2013-12-09 15:19:14 +01:00
touffies
d476672150 Add SEO Meta to CATEGORY/PRODUCT/FOLDER/CONTENT 2013-12-09 15:00:51 +01:00
touffies
3d48eab76c Remove unused variable $current_id 2013-12-09 14:52:44 +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
Michaël Espeche
990cda786d Add of hook module to content and folder edition page. 2013-12-09 10:36:09 +01:00
Manuel Raynaud
10c662d24d Merge pull request #134 from gmorel/french_translation
Adding some French translation for backoffice
2013-12-08 01:36:58 -08:00
Franck Allimant
592b306b9e Fixed nt,-group css rule which caused garbage in top bar buttons 2013-12-07 09:58:01 +01:00
Franck Allimant
8c864021f5 Added sorting and position ùmanagement to modules. 2013-12-06 18:59:46 +01:00
gmorel
40c47affec Adding translation for Backoffice 2013-12-06 17:22:07 +01:00
gmorel
3f8e1dc89b Adding translation for Backoffice 2013-12-06 17:22:07 +01:00
Franck Allimant
e96088080d Merge branch 'master' into modules 2013-12-06 17:16:14 +01:00
Franck Allimant
52c7c6c9f7 Added translation of email templates 2013-12-06 10:44:06 +01:00
gmorel
e53588e8f0 Adding translation for Backoffice 2013-12-05 18:24:47 +01:00