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

Conflicts:
	core/lib/Thelia/Model/Product.php

2013-09-17 23:51:31 +02:00

..

AbstractCrudController.php

Finished category related content management

2013-09-17 13:50:01 +02:00

AdminController.php

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

2013-09-16 09:23:44 +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

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

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

CategoryController.php

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

2013-09-17 23:51:31 +02:00

ConfigController.php

Started category management

2013-09-16 18:58:45 +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

translate error message

2013-09-12 12:43:44 +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

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

ProductController.php

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

2013-09-17 23:51:31 +02:00

SessionController.php

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

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

TemplateController.php

Started category management

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