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

Conflicts:
	core/lib/Thelia/Config/Resources/routing/admin.xml

2013-09-16 11:01:00 +02:00

..

AbstractCrudController.php

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

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

AdminController.php

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

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

AttributeAvController.php

Finished attributes management

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

AttributeController.php

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

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

BaseAdminController.php

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

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

CategoryController.php

fix cs

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

ConfigController.php

Finished attributes management

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

CountryController.php

Countries view and routing creation

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

CouponController.php

WIP : Coupon fix coupon creation issue

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

CurrencyController.php

Finished attributes management

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

CustomerController.php

translate error message

2013-09-12 12:43:44 +02:00

FeatureAvController.php

Finished Features management

2013-09-16 10:40:52 +02:00

FeatureController.php

Finished Features management

2013-09-16 10:40:52 +02:00

MessageController.php

Finished attributes management

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

OrderController.php

- Creation of order-edit view

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

SessionController.php

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

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

TemplateController.php

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

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