Franck Allimant 5bf51dd47e Merge branch 'catalog' ...

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Config/Resources/routing/admin.xml
	core/lib/Thelia/Core/Template/Loop/Country.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
	core/lib/Thelia/Model/Country.php
	core/lib/Thelia/Model/Profile.php
	core/lib/Thelia/Model/ProfileQuery.php
	install/insert.sql
	install/thelia.sql
	local/config/schema.xml

2013-10-24 00:16:33 +02:00

..

ajax

create ajax modal for lang edition

2013-10-23 12:38:32 +02:00

assets

Merge branch 'catalog'

2013-10-24 00:16:33 +02:00

configs

order admin

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

coupon

WIP : Coupon : Fix condition edition

2013-09-27 15:57:56 +02:00

includes

Merge branch 'catalog'

2013-10-24 00:16:33 +02:00

404.html

Smarty inheritance in admin template.

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

admin-layout.tpl

fix minor admin bugs

2013-10-23 19:23:29 +02:00

administrators.html

administrators management

2013-10-23 16:31:37 +02:00

attribute-edit.html

fix auth loop

2013-10-22 15:57:31 +02:00

attributes.html

fix auth loop

2013-10-22 15:57:31 +02:00

categories.html

fix auth loop

2013-10-22 15:57:31 +02:00

category-edit.html

fix auth loop

2013-10-22 15:57:31 +02:00

configuration.html

fix auth loop

2013-10-22 15:57:31 +02:00

content-edit.html

permission management

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

countries.html

fix auth loop

2013-10-22 15:57:31 +02:00

country-edit.html

permission management

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

coupon-create.html

Merge branch 'master' of https://github.com/thelia/thelia into coupon

2013-10-22 23:01:04 +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

Merge branch 'master' of https://github.com/thelia/thelia into coupon

2013-10-22 23:01:04 +02:00

currencies.html

fix auth loop

2013-10-22 15:57:31 +02:00

currency-edit.html

permission management

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

customer-edit.html

add customer order list

2013-10-23 19:53:47 +02:00

customers.html

fix auth loop

2013-10-22 15:57:31 +02:00

document-edit.html

permission management

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

feature-edit.html

fix auth loop

2013-10-22 15:57:31 +02:00

features.html

fix auth loop

2013-10-22 15:57:31 +02:00

folder-edit.html

fix auth loop

2013-10-22 15:57:31 +02:00

folders.html

fix auth loop

2013-10-22 15:57:31 +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

manage lanf <=> url assignment

2013-10-23 19:04:49 +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

fix auth loop

2013-10-22 15:57:31 +02:00

modules.html

fix auth loop

2013-10-22 15:57:31 +02:00

order-edit.html

permission management

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

orders.html

fix auth loop

2013-10-22 15:57:31 +02:00

product-edit.html

Merge branch 'catalog'

2013-10-24 00:16:33 +02:00

profile-edit.html

module access management

2013-10-22 20:20:15 +02:00

profiles.html

fix auth loop

2013-10-22 15:57:31 +02:00

shipping-configuration-edit.html

permission management

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

shipping-configuration.html

fix auth loop

2013-10-22 15:57:31 +02:00

shipping-zones-edit.html

permission management

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

shipping-zones.html

fix auth loop

2013-10-22 15:57:31 +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

fix auth loop

2013-10-22 15:57:31 +02:00

template-edit.html

permission management

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

templates.html

fix auth loop

2013-10-22 15:57:31 +02:00

variable-edit.html

permission management

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

variables.html

fix auth loop

2013-10-22 15:57:31 +02:00