Etienne Roudeix 622e1ca3b6 Merge branch 'master' into tax ...

Conflicts:
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Model/Base/AttributeTemplate.php
	core/lib/Thelia/Model/Base/AttributeTemplateQuery.php
	core/lib/Thelia/Model/Map/AttributeTemplateTableMap.php
	install/thelia.sql
	local/config/schema.xml

2013-09-27 10:29:51 +02:00

..

ajax

Finished combination creation GUI

2013-09-23 11:41:14 +02:00

assets

Merge branch 'master' into tax

2013-09-27 10:29:51 +02:00

configs

order admin

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

coupon

WIP : Coupon fix coupon creation issue

2013-09-13 18:03:08 +02:00

includes

Working : images : enhance display

2013-09-26 15:26:45 +02:00

404.html

Smarty inheritance in admin template.

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

admin-layout.tpl

Merge branch 'master' into tax

2013-09-25 15:58:43 +02:00

attribute-edit.html

Aded feature_template and category_template position management

2013-09-21 11:46:09 +02:00

attributes.html

Aded feature_template and category_template position management

2013-09-21 11:46:09 +02:00

categories.html

Finished product multiple categories attachment

2013-09-22 22:14:39 +02:00

category-edit.html

WIP : upload documents : add action, ctrl, event

2013-09-24 10:54:52 +02:00

configuration.html

All tables are now responsive

2013-09-19 17:01:17 +02:00

content-edit.html

Merge branch 'catalog'

2013-09-26 19:07:06 +02:00

countries.html

All tables are now responsive

2013-09-19 17:01:17 +02:00

country-edit.html

Add validation button on form

2013-09-16 13:02:57 +02:00

coupon-create.html

WIP : Coupon fix coupon creation issue

2013-09-13 18:03:08 +02:00

coupon-list.html

All tables are now responsive

2013-09-19 17:01:17 +02:00

coupon-read.html

All tables are now responsive

2013-09-19 17:01:17 +02:00

coupon-update.html

Working : Coupon : fix links and errors display

2013-09-13 12:42:33 +02:00

currencies.html

Aded feature_template and category_template position management

2013-09-21 11:46:09 +02:00

currency-edit.html

Started category management

2013-09-16 18:58:45 +02:00

customer-edit.html

All tables are now responsive

2013-09-19 17:01:17 +02:00

customers.html

order admin

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

document-edit.html

Working : Fix : Image Management + Document Management

2013-09-24 18:41:28 +02:00

feature-edit.html

Aded feature_template and category_template position management

2013-09-21 11:46:09 +02:00

features.html

Aded feature_template and category_template position management

2013-09-21 11:46:09 +02:00

folder-edit.html

WIP : upload documents : add action, ctrl, event

2013-09-24 10:54:52 +02:00

folders.html

Merge branch 'catalog'

2013-09-26 19:07:06 +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

Working : Fix : Image Management + Document Management

2013-09-24 18:41:28 +02:00

login.html

Autofocus on username field for better use

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

message-edit.html

Started category management

2013-09-16 18:58:45 +02:00

messages.html

All tables are now responsive

2013-09-19 17:01:17 +02:00

modules.html

All tables are now responsive

2013-09-19 17:01:17 +02:00

order-edit.html

edit order form

2013-09-26 13:07:51 +02:00

orders.html

fix tests

2013-09-26 10:43:09 +02:00

product-edit.html

Merge branch 'catalog' of https://github.com/thelia/thelia into upload_management

2013-09-24 18:41:57 +02:00

profile-edit.html

Add default language & editing language default field

2013-09-20 12:00:39 +02:00

shipping-configuration-edit.html

All tables are now responsive

2013-09-19 17:01:17 +02:00

shipping-configuration.html

All tables are now responsive

2013-09-19 17:01:17 +02:00

shipping-zones-edit.html

All tables are now responsive

2013-09-19 17:01:17 +02:00

shipping-zones.html

All tables are now responsive

2013-09-19 17:01:17 +02:00

template-edit.html

Finished combination creation GUI

2013-09-23 11:41:14 +02:00

templates.html

Aded feature_template and category_template position management

2013-09-21 11:46:09 +02:00

variable-edit.html

Started category management

2013-09-16 18:58:45 +02:00

variables.html

All tables are now responsive

2013-09-19 17:01:17 +02:00