touffies 9d5aa5e077 Merge branch 'master' into frontend ...

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml

2013-10-22 11:55:58 +02:00

..

ajax

Merge branch 'master' into frontend

2013-10-22 11:55:58 +02:00

assets

Merge with Master

2013-10-15 11:05:05 +02:00

configs

order admin

2013-09-25 13:26:12 +02:00

coupon

WIP : coupon refactor + fix

2013-09-26 17:47:41 +02:00

includes

Merge branch 'master' into tax

2013-10-21 17:48:13 +02:00

404.html

Smarty inheritance in admin template.

2013-09-03 11:26:03 +02:00

admin-layout.tpl

permission management

2013-10-22 11:09:24 +02:00

attribute-edit.html

permission management

2013-10-22 11:09:24 +02:00

attributes.html

permission management

2013-10-22 11:09:24 +02:00

categories.html

permission management

2013-10-22 11:09:24 +02:00

category-edit.html

permission management

2013-10-22 11:09:24 +02:00

configuration.html

permission management

2013-10-22 11:09:24 +02:00

content-edit.html

permission management

2013-10-22 11:09:24 +02:00

countries.html

permission management

2013-10-22 11:09:24 +02:00

country-edit.html

permission management

2013-10-22 11:09:24 +02:00

coupon-create.html

permission management

2013-10-22 11:09:24 +02:00

coupon-list.html

permission management

2013-10-22 11:09:24 +02:00

coupon-read.html

permission management

2013-10-22 11:09:24 +02:00

coupon-update.html

permission management

2013-10-22 11:09:24 +02:00

currencies.html

permission management

2013-10-22 11:09:24 +02:00

currency-edit.html

permission management

2013-10-22 11:09:24 +02:00

customer-edit.html

Merge branch 'master' into frontend

2013-10-22 11:55:58 +02:00

customers.html

Merge branch 'master' into frontend

2013-10-22 11:55:58 +02:00

document-edit.html

permission management

2013-10-22 11:09:24 +02:00

feature-edit.html

permission management

2013-10-22 11:09:24 +02:00

features.html

permission management

2013-10-22 11:09:24 +02:00

folder-edit.html

permission management

2013-10-22 11:09:24 +02:00

folders.html

permission management

2013-10-22 11:09:24 +02:00

general_error.html

No alert bloc

2013-09-16 15:32:52 +02:00

home.html

Fixed translations

2013-09-20 09:57:30 +02:00

image-edit.html

permission management

2013-10-22 11:09:24 +02:00

languages.html

permission management

2013-10-22 11:09:24 +02:00

login.html

Autofocus on username field for better use

2013-09-16 15:15:30 +02:00

mailing-system.html

permission management

2013-10-22 11:09:24 +02:00

message-edit.html

permission management

2013-10-22 11:09:24 +02:00

messages.html

permission management

2013-10-22 11:09:24 +02:00

modules.html

permission management

2013-10-22 11:09:24 +02:00

order-edit.html

permission management

2013-10-22 11:09:24 +02:00

orders.html

permission management

2013-10-22 11:09:24 +02:00

product-edit.html

permission management

2013-10-22 11:09:24 +02:00

profile-edit.html

permission management

2013-10-22 11:09:24 +02:00

profiles.html

permission management

2013-10-22 11:09:24 +02:00

shipping-configuration-edit.html

permission management

2013-10-22 11:09:24 +02:00

shipping-configuration.html

permission management

2013-10-22 11:09:24 +02:00

shipping-zones-edit.html

permission management

2013-10-22 11:09:24 +02:00

shipping-zones.html

permission management

2013-10-22 11:09:24 +02:00

tax-edit.html

permission management

2013-10-22 11:09:24 +02:00

tax-rule-edit.html

permission management

2013-10-22 11:09:24 +02:00

taxes-rules.html

permission management

2013-10-22 11:09:24 +02:00

template-edit.html

permission management

2013-10-22 11:09:24 +02:00

templates.html

permission management

2013-10-22 11:09:24 +02:00

variable-edit.html

permission management

2013-10-22 11:09:24 +02:00

variables.html

permission management

2013-10-22 11:09:24 +02:00