Etienne Roudeix c63c509f2f Merge branch 'master' into tax ...

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	templates/admin/default/configuration.html

2013-10-21 08:13:18 +02:00

..

AbstractCrudController.php

end tax edition

2013-10-17 11:53:26 +02:00

AddressController.php

finish customer address update

2013-10-07 09:53:25 +02:00

AdminController.php

fix cs

2013-09-30 10:35:34 +02:00

AdminProfileController.php

Setting admin profile creation (route, view, form)

2013-09-24 09:36:48 +02:00

AreaController.php

complete admin log message

2013-10-14 12:40:09 +02:00

AttributeAvController.php

fix cs

2013-09-30 10:35:34 +02:00

AttributeController.php

fix cs

2013-09-30 10:35:34 +02:00

BaseAdminController.php

allow country update

2013-10-10 14:20:53 +02:00

CategoryController.php

fix cs

2013-09-30 10:35:34 +02:00

ConfigController.php

fix cs

2013-09-30 10:35:34 +02:00

ContentController.php

create removeAdditionalFolder controller, event and listener

2013-10-01 10:08:48 +02:00

CountryController.php

complete AreaController

2013-10-11 16:48:15 +02:00

CouponController.php

fix cs

2013-09-30 10:35:34 +02:00

CurrencyController.php

fix cs

2013-09-30 10:35:34 +02:00

CustomerController.php

put dedicated controller for address mangamenent

2013-10-03 16:31:15 +02:00

FeatureAvController.php

fix cs

2013-09-30 10:35:34 +02:00

FeatureController.php

fix cs

2013-09-30 10:35:34 +02:00

FileController.php

fix cs

2013-09-30 10:35:34 +02:00

FolderController.php

fix cs

2013-09-30 10:35:34 +02:00

LanguageController.php

Setting languages view and route

2013-09-23 09:55:54 +02:00

MailingSystemController.php

Creation of mailing system configuration variables management view

2013-09-20 16:10:53 +02:00

MessageController.php

refactor message events

2013-09-30 10:01:06 +02:00

ModuleController.php

fix cs

2013-09-30 10:35:34 +02:00

OrderController.php

create purchase order pdf

2013-10-03 10:45:21 +02:00

ProductController.php

create contentAddFolder process

2013-10-01 09:51:07 +02:00

ProfileController.php

new model

2013-10-21 08:10:55 +02:00

SessionController.php

fix cs

2013-09-30 10:35:34 +02:00

ShippingZoneController.php

remove area to area_delivery_module

2013-10-14 17:45:23 +02:00

TaxController.php

tax rule set default in back office

2013-10-17 15:31:09 +02:00

TaxRuleController.php

tax rule set default in back office

2013-10-17 15:31:09 +02:00

TemplateController.php

fix cs

2013-09-30 10:35:34 +02:00