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

..

AbstractCrudController.php

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

2013-09-23 12:27:36 +02:00

AdminController.php

Setting profile edition route and view

2013-09-19 17:30:57 +02:00

AttributeAvController.php

Started category management

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

AttributeController.php

Started category management

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

BaseAdminController.php

Finished product combination basic function

2013-09-23 18:36:55 +02:00

CategoryController.php

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

2013-09-21 14:44:57 +02:00

ConfigController.php

Started category management

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

ContentController.php

allow to delete content

2013-09-23 12:40:01 +02:00

CountryController.php

- Edit country view creation

2013-09-16 12:55:34 +02:00

CouponController.php

WIP : Coupon fix coupon creation issue

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

CurrencyController.php

Started category management

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

CustomerController.php

order admin

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

FeatureAvController.php

Started category management

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

FeatureController.php

Started category management

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

FileController.php

Working : Fix : Image Management + Document Management

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

FolderController.php

display content modification page

2013-09-21 15:20:06 +02:00

MessageController.php

Finished attributes management

2013-09-13 00:19:53 +02:00

ModuleController.php

Add modules routing and default action/view

2013-09-19 13:27:47 +02:00

OrderController.php

edit order form

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

ProductController.php

Finished product combination basic function

2013-09-23 18:36:55 +02:00

SessionController.php

Implemented "Remember Me" feature on admin. Started template management

2013-09-16 09:23:44 +02:00

ShippingConfigurationController.php

- Edit shipping_zone routes

2013-09-18 19:33:24 +02:00

ShippingZoneController.php

- Edit shipping_zone routes

2013-09-18 19:33:24 +02:00

TemplateController.php

Finished product multiple categories attachment

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