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

Conflicts:
	core/lib/Thelia/Config/Resources/action.xml
	core/lib/Thelia/Controller/Admin/AddressController.php
	core/lib/Thelia/Controller/Admin/CustomerController.php
	core/lib/Thelia/Controller/Admin/ModuleController.php

2013-10-21 17:48:13 +02:00

..

Address.php

put dedicated controller for address mangamenent

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

Area.php

fix cs

2013-10-18 09:28:17 +02:00

Attribute.php

fix cs

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

AttributeAv.php

fix cs

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

BaseAction.php

fix cs

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

BaseCachedFile.php

fix cs

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

Cache.php

fix cs

2013-10-18 09:28:17 +02:00

Cart.php

refactor cart events

2013-09-30 10:15:22 +02:00

Category.php

fix cs

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

Config.php

refactor config events

2013-09-30 10:10:44 +02:00

Content.php

fix cs

2013-10-18 09:28:17 +02:00

Country.php

fix cs

2013-10-18 09:28:17 +02:00

Coupon.php

WIP : Refactor contraint/rule becomes conditions (more generic)

2013-09-25 16:36:14 +02:00

Currency.php

Merge branch 'refactor_action'

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

Customer.php

fix cs

2013-10-18 09:28:17 +02:00

Document.php

fix cs

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

Feature.php

fix cs

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

FeatureAv.php

fix cs

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

Folder.php

test folder removal

2013-10-01 13:52:51 +02:00

HttpException.php

fix cs

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

Image.php

fix cs

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

Message.php

refactor message events

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

Module.php

clear cache when a module is removed

2013-10-21 11:32:50 +02:00

Order.php

fix tests

2013-10-07 14:36:20 +02:00

Pdf.php

fix cs

2013-10-18 09:28:17 +02:00

Product.php

fix cs

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

Profile.php

WIP : admin profiles

2013-10-21 11:44:33 +02:00

ShippingZone.php

fix cs

2013-10-18 09:28:17 +02:00

Tax.php

tax rule set default in back office

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

TaxRule.php

Merge branch 'master' into module_management

2013-10-21 09:19:08 +02:00

Template.php

fix cs

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