Etienne Roudeix 233c952b4e Merge branch 'master' into template ...

Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php
	core/lib/Thelia/Model/Base/Module.php
	core/lib/Thelia/Model/Base/ModuleQuery.php
	core/lib/Thelia/Model/Map/ModuleTableMap.php
	install/thelia.sql
	local/config/schema.xml

2013-09-17 12:44:34 +02:00

..

Address.php

allow address removal from front

2013-09-13 12:33:13 +02:00

Attribute.php

Finished Features management

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

AttributeAv.php

AttributesAv management

2013-09-12 15:43:37 +02:00

BaseAction.php

fix cs

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

BaseCachedFile.php

Added documents action and loop

2013-09-17 01:07:42 +02:00

Cart.php

save if producSaleElements is in promo or not

2013-09-16 10:49:42 +02:00

Category.php

Started category management

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

Config.php

Started category management

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

Coupon.php

WIP : Coupon event dispatcher + action

2013-09-12 17:21:49 +02:00

Currency.php

Started category management

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

Customer.php

valid customer removal

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

Document.php

Added documents action and loop

2013-09-17 01:07:42 +02:00

Feature.php

Finished Features management

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

FeatureAv.php

Finished Features management

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

HttpException.php

call display403 method

2013-09-12 17:13:52 +02:00

Image.php

Added documents action and loop

2013-09-17 01:07:42 +02:00

Message.php

Started category management

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

Order.php

delivery form

2013-09-17 11:05:29 +02:00

Template.php

Completed template management

2013-09-16 12:52:35 +02:00