Manuel Raynaud 7bf5ee31c9 Merge branch 'refactor_action' ...

Conflicts:
	core/lib/Thelia/Action/Product.php
	core/lib/Thelia/Controller/Admin/CategoryController.php
	core/lib/Thelia/Controller/Admin/ProductController.php
	core/lib/Thelia/Controller/Admin/TemplateController.php

2013-09-30 10:26:59 +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

refactor address and attribute events

2013-09-30 10:03:14 +02:00

AttributeController.php

refactor address and attribute events

2013-09-30 10:03:14 +02:00

BaseAdminController.php

Finished product combination basic function

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

CategoryController.php

Merge branch 'refactor_action'

2013-09-30 10:26:59 +02:00

ConfigController.php

refactor config events

2013-09-30 10:10:44 +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 refactor + fix

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

CurrencyController.php

refactor currency events

2013-09-30 10:11:55 +02:00

CustomerController.php

Merge branch 'refactor_action'

2013-09-30 10:26:59 +02:00

FeatureAvController.php

refactor feature events

2013-09-30 10:16:57 +02:00

FeatureController.php

refactor feature events

2013-09-30 10:16:57 +02:00

FileController.php

Working : Fix : Image Management + Document Management

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

FolderController.php

move folders action class to Folder directory

2013-09-25 17:53:38 +02:00

MessageController.php

refactor message events

2013-09-30 10:01:06 +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

Merge branch 'refactor_action'

2013-09-30 10:26:59 +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

Merge branch 'refactor_action'

2013-09-30 10:26:59 +02:00