Manuel Raynaud 7bf5ee31c9 Merge branch 'refactor_action' ...

Conflicts:
	core/lib/Thelia/Action/Product.php
	core/lib/Thelia/Controller/Admin/CategoryController.php
	core/lib/Thelia/Controller/Admin/ProductController.php
	core/lib/Thelia/Controller/Admin/TemplateController.php

2013-09-30 10:26:59 +02:00

..

assets

allow to order products on category page

2013-09-20 13:59:51 +02:00

includes

translate some missing string

2013-09-20 16:31:25 +02:00

account.html

change link to home page in front template

2013-09-19 16:45:38 +02:00

address-update.html

change link to home page in front template

2013-09-19 16:45:38 +02:00

address.html

change link to home page in front template

2013-09-19 16:45:38 +02:00

cart.html

translations intl

2013-09-27 11:04:14 +02:00

category.html

allow to order products on category page

2013-09-20 13:59:51 +02:00

index.html

allow to order products on category page

2013-09-20 13:59:51 +02:00

layout.tpl

refactor product events, moving to Prduct folder

2013-09-25 17:50:29 +02:00

login.html

change link to home page in front template

2013-09-19 16:45:38 +02:00

modal-address.html

add helper checkXmlHttpRequest

2013-09-12 16:45:32 +02:00

order_delivery.html

translations intl

2013-09-27 11:04:14 +02:00

order_invoice.html

translations intl

2013-09-27 11:04:14 +02:00

order_placed.html

fix template

2013-09-27 15:23:35 +02:00

password.html

fix missing } in password template

2013-09-25 08:01:27 +02:00

product.html

complete meta tag for product part

2013-09-19 19:05:56 +02:00

register.html

change link to home page in front template

2013-09-19 16:45:38 +02:00