franck 14e0eff0f5 Merge branch 'master' of https://github.com/thelia/thelia ...

Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php
	templates/admin/default/admin-layout.tpl

2013-09-12 13:04:12 +02:00

..

AdminController.php

Completed the backoffice variable management

2013-09-02 00:17:27 +02:00

AttributeController.php

Created AbstractCrudController, and refactored existing controllers

2013-09-12 13:02:40 +02:00

BaseAdminController.php

Removed a redondant "use"

2013-09-11 15:08:56 +02:00

CategoryController.php

fix cs

2013-09-11 08:27:40 +02:00

ConfigController.php

Created AbstractCrudController, and refactored existing controllers

2013-09-12 13:02:40 +02:00

CouponController.php

fix cs

2013-09-11 08:27:40 +02:00

CurrencyController.php

Created AbstractCrudController, and refactored existing controllers

2013-09-12 13:02:40 +02:00

CustomerController.php

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

2013-09-11 10:26:56 +02:00

MessageController.php

Created AbstractCrudController, and refactored existing controllers

2013-09-12 13:02:40 +02:00

OrderController.php

- Creation of order-edit view

2013-09-12 12:40:46 +02:00

SessionController.php

fix cs

2013-09-11 08:27:40 +02:00