Manuel Raynaud 0c564be4c5 Merge branch 'master' of https://github.com/enurit/thelia into enurit-master ...

Conflicts:
	templates/frontOffice/default/I18n/fr_FR.php

2014-01-14 19:21:01 +01:00

..

ajax

dynamic delivery modules on delivery front template

2013-12-20 12:14:20 +01:00

assets

Add missing page for folder

2013-12-09 15:00:52 +01:00

email

Merge

2013-11-28 22:32:39 +01:00

I18n

[front office] translation fixes

2014-01-14 15:52:12 +01:00

includes

Add missing page for folder

2013-12-09 15:00:52 +01:00

misc

update breadcrumb.tpl unescape the last item

2014-01-07 11:02:08 +01:00

404.html

Merge master

2013-11-27 20:24:38 +01:00

account-password.html

Merge master

2013-11-27 20:24:38 +01:00

account-update.html

Merge master

2013-11-27 20:24:38 +01:00

account.html

Merge master

2013-11-27 20:24:38 +01:00

address-update.html

Merge master

2013-11-27 20:24:38 +01:00

address.html

Merge master

2013-11-27 20:24:38 +01:00

cart.html

Merge master

2013-11-27 20:24:38 +01:00

category.html

Add SEO Meta to CATEGORY/PRODUCT/FOLDER/CONTENT

2013-12-09 15:00:51 +01:00

contact-success.html

Merge master

2013-11-27 20:24:38 +01:00

contact.html

Merge master

2013-11-27 20:24:38 +01:00

content.html

Add SEO Meta to CATEGORY/PRODUCT/FOLDER/CONTENT

2013-12-09 15:00:51 +01:00

currency.html

Merge master

2013-11-27 20:24:38 +01:00

folder.html

Add missing page for folder

2013-12-09 15:00:52 +01:00

index.html

Merge master

2013-11-27 20:24:38 +01:00

language.html

Merge master

2013-11-27 20:24:38 +01:00

layout.tpl

[Back-office] Add core translation

2014-01-14 15:18:03 +01:00

login.html

Merge master

2013-11-27 20:24:38 +01:00

modal-address.html

Merge master

2013-11-27 20:24:38 +01:00

newsletter.html

Merge master

2013-11-27 20:24:38 +01:00

order-delivery.html

dynamic delivery modules on delivery front template

2013-12-20 12:14:20 +01:00

order-invoice.html

Revert "Revert "Merge branch 'cleanmaster' into modules""

2014-01-06 11:25:25 +01:00

order-placed.html

Merge master

2013-11-27 20:24:38 +01:00

password.html

Merge master

2013-11-27 20:24:38 +01:00

product.html

Merge branch 'master' into frontend

2013-12-16 15:45:04 +01:00

register.html

Merge master

2013-11-27 20:24:38 +01:00

search.html

Merge master

2013-11-27 20:24:38 +01:00

view_all.html

Merge master

2013-11-27 20:24:38 +01:00