Etienne Roudeix 622e1ca3b6 Merge branch 'master' into tax ...

Conflicts:
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Model/Base/AttributeTemplate.php
	core/lib/Thelia/Model/Base/AttributeTemplateQuery.php
	core/lib/Thelia/Model/Map/AttributeTemplateTableMap.php
	install/thelia.sql
	local/config/schema.xml

2013-09-27 10:29:51 +02:00

..

Address.php

allow address removal from front

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

Attribute.php

Finished product multiple categories attachment

2013-09-22 22:14:39 +02:00

AttributeAv.php

Finished product multiple categories attachment

2013-09-22 22:14:39 +02:00

BaseAction.php

Merge branch 'catalog' of https://github.com/thelia/thelia into upload_management

2013-09-23 12:27:36 +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

Finished product multiple categories attachment

2013-09-22 22:14:39 +02:00

Config.php

Started category management

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

Content.php

allow to delete content

2013-09-23 12:40:01 +02:00

Coupon.php

WIP : Coupon event dispatcher + action

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

Currency.php

Finished product multiple categories attachment

2013-09-22 22:14:39 +02:00

Customer.php

valid customer removal

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

Document.php

Working : Fix : Image Management + Document Management

2013-09-24 18:41:28 +02:00

Feature.php

Finished product multiple categories attachment

2013-09-22 22:14:39 +02:00

FeatureAv.php

Finished product multiple categories attachment

2013-09-22 22:14:39 +02:00

Folder.php

implement process for changing folder position

2013-09-20 20:38:39 +02:00

HttpException.php

call display403 method

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

Image.php

Working : Add a link on documents

2013-09-24 12:25:19 +02:00

Message.php

Started category management

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

Order.php

order address changes tests

2013-09-26 14:17:26 +02:00

Product.php

Finished product combination basic function

2013-09-23 18:36:55 +02:00

Template.php

Finished product multiple categories attachment

2013-09-22 22:14:39 +02:00