Etienne Roudeix 536c88b4f8 Merge branch 'cleanmaster' into modules ...

Conflicts:
	core/lib/Thelia/Tests/Action/RewrittenUrlTestTrait.php

2013-12-16 09:57:35 +01:00

..

ajax

Merge master

2013-12-04 14:42:15 +01:00

assets

add jquery ui (ooops)

2013-12-16 09:10:35 +01:00

configs

Merge master

2013-12-04 14:42:15 +01:00

coupon

Merge master

2013-12-04 14:42:15 +01:00

I18n

update profil translation

2013-12-14 17:18:44 +01:00

includes

Merge branch 'cleanmaster' into modules

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

404.html

change template subdirs

2013-11-13 10:24:14 +01:00

admin-layout.tpl

fix link in admin footer

2013-12-14 13:27:09 +01:00

admin-logs.html

change template subdirs

2013-11-13 10:24:14 +01:00

administrators.html

Merge master

2013-12-04 14:42:15 +01:00

attribute-edit.html

Merge master

2013-12-04 14:42:15 +01:00

attributes.html

Merge master

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

categories.html

change template subdirs

2013-11-13 10:24:14 +01:00

category-edit.html

add jquery ui in assets

2013-12-16 09:40:13 +01:00

config-store.html

Merge master

2013-12-04 14:42:15 +01:00

configuration.html

Merge master

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

content-edit.html

add jquery ui in assets

2013-12-16 09:40:13 +01:00

countries.html

Merge master

2013-12-04 14:42:15 +01:00

country-edit.html

Merge master

2013-12-04 14:42:15 +01:00

coupon-create.html

change template subdirs

2013-11-13 10:24:14 +01:00

coupon-list.html

change template subdirs

2013-11-13 10:24:14 +01:00

coupon-read.html

Fix typo

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

coupon-update.html

change template subdirs

2013-11-13 10:24:14 +01:00

currencies.html

Merge master

2013-12-04 14:42:15 +01:00

currency-edit.html

Merge master

2013-12-04 14:42:15 +01:00

customer-edit.html

Merge master

2013-12-04 14:42:15 +01:00

customers.html

Merge master

2013-12-04 14:42:15 +01:00

document-edit.html

Merge master

2013-12-04 14:42:15 +01:00

feature-edit.html

Merge master

2013-12-04 14:42:15 +01:00

features.html

Merge master

2013-12-04 14:42:15 +01:00

folder-edit.html

add jquery ui in assets

2013-12-16 09:40:13 +01:00

folders.html

Merge master

2013-12-04 14:42:15 +01:00

general_error.html

change template subdirs

2013-11-13 10:24:14 +01:00

home.html

change template subdirs

2013-11-13 10:24:14 +01:00

image-edit.html

Fix typo

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

languages.html

Merge master

2013-12-04 14:42:15 +01:00

login.html

change template subdirs

2013-11-13 10:24:14 +01:00

mailing-system.html

Merge master

2013-12-04 14:42:15 +01:00

message-edit.html

Merge master

2013-12-04 14:42:15 +01:00

messages.html

Merge master

2013-12-04 14:42:15 +01:00

module-configure.html

Merge master

2013-12-04 14:42:15 +01:00

module-edit.html

Merge master

2013-12-04 14:42:15 +01:00

modules.html

Added sorting and position ùmanagement to modules.

2013-12-06 18:59:46 +01:00

order-edit.html

Merge master

2013-12-04 14:42:15 +01:00

orders.html

Merge master

2013-12-04 14:42:15 +01:00

product-edit.html

Merge branch 'cleanmaster' into modules

2013-12-16 09:57:35 +01:00

profile-edit.html

Merge master

2013-12-04 14:42:15 +01:00

profiles.html

Merge master

2013-12-04 14:42:15 +01:00

search.html

Merge branch 'master' into modules

2013-12-06 17:16:14 +01:00

shipping-configuration-edit.html

Merge master

2013-12-04 14:42:15 +01:00

shipping-configuration.html

Merge master

2013-12-04 14:42:15 +01:00

shipping-zones-edit.html

Merge master

2013-12-04 14:42:15 +01:00

shipping-zones.html

Merge master

2013-12-04 14:42:15 +01:00

system-logs.html

Merge master

2013-12-04 14:42:15 +01:00

tax-edit.html

Merge master

2013-12-04 14:42:15 +01:00

tax-rule-edit.html

Merge master

2013-12-04 14:42:15 +01:00

taxes-rules.html

Fix typo

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

template-edit.html

Merge master

2013-12-04 14:42:15 +01:00

templates.html

Merge master

2013-12-04 14:42:15 +01:00

translations.html

Added translation of email templates

2013-12-06 10:44:06 +01:00

variable-edit.html

Merge master

2013-12-04 14:42:15 +01:00

variables.html

Merge master

2013-12-04 14:42:15 +01:00