Franck Allimant 5bf51dd47e Merge branch 'catalog' ...

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Config/Resources/routing/admin.xml
	core/lib/Thelia/Core/Template/Loop/Country.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
	core/lib/Thelia/Model/Country.php
	core/lib/Thelia/Model/Profile.php
	core/lib/Thelia/Model/ProfileQuery.php
	install/insert.sql
	install/thelia.sql
	local/config/schema.xml

2013-10-24 00:16:33 +02:00

..

Address.php

put dedicated controller for address mangamenent

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

Administrator.php

administrators management

2013-10-23 16:31:37 +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

fix cart quantity for issue #46

2013-10-22 17:19:16 +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

Working adding decrementation when coupon is consumed

2013-10-22 23:04:08 +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

Lang.php

manage lanf <=> url assignment

2013-10-23 19:04:49 +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

Newsletter.php

complete controller and newsletter listener

2013-10-22 10:01:02 +02:00

Order.php

Merge branch 'catalog'

2013-10-24 00:16:33 +02:00

Pdf.php

fix cs

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

Product.php

Worked on catalog

2013-10-23 23:41:39 +02:00

ProductSaleElement.php

Worked on catalog

2013-10-23 23:47:44 +02:00

Profile.php

module access management

2013-10-22 20:20:15 +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