Manuel Raynaud 0c24a8afc0 Merge branch 'master' into modules ...

Conflicts:
	templates/backOffice/default/product-edit.html

2013-12-17 10:48:59 +01:00

..

Address.php

Allow to update the label address

2013-11-05 14:59:15 +01:00

Administrator.php

finish admin update password command line

2013-10-30 15:35:11 +01:00

Area.php

fix cs

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

Attribute.php

Combination creation management

2013-10-30 15:44:32 +01:00

AttributeAv.php

fix cs

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

BaseAction.php

fix test suite reimplementing url updating trest

2013-12-16 17:29:25 +01: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 issue #47

2013-10-24 10:36:06 +02:00

Category.php

Add SEO Meta to CATEGORY/PRODUCT/FOLDER/CONTENT

2013-12-09 15:00:51 +01:00

Config.php

refactor config events

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

Content.php

Add SEO Meta to CATEGORY/PRODUCT/FOLDER/CONTENT

2013-12-09 15:00:51 +01:00

Country.php

fix cs

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

Coupon.php

Coupon : Fix namespace issues

2013-11-24 22:27:26 +01:00

Currency.php

Merge branch 'refactor_action'

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

Customer.php

Refactored back-office customer management

2013-11-09 18:28:01 +01:00

Document.php

document positioning

2013-12-16 10:55:18 +01:00

Feature.php

Combination creation management

2013-10-30 15:44:32 +01:00

FeatureAv.php

fix cs

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

Folder.php

Add SEO Meta to CATEGORY/PRODUCT/FOLDER/CONTENT

2013-12-09 15:00:51 +01:00

HttpException.php

asset tests

2013-11-25 10:03:48 +01:00

Image.php

document positioning

2013-12-16 10:55:18 +01:00

Lang.php

fix cs

2013-10-25 10:07:21 +02:00

MailingSystem.php

mailing sytem admin

2013-10-28 12:24:59 +01:00

Message.php

Implemented mail messages templates and layouts

2013-11-27 21:21:07 +01:00

Module.php

Added sorting and position ùmanagement to modules.

2013-12-06 18:59:46 +01:00

Newsletter.php

fix cs

2013-10-25 10:07:21 +02:00

Order.php

Implemented mail messages templates and layouts

2013-11-27 21:21:07 +01:00

Pdf.php

fix cs

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

Product.php

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

2013-12-09 15:22:17 +01:00

ProductSaleElement.php

Fixed issue 118

2013-12-05 15:57:56 +01:00

Profile.php

fix cs

2013-10-25 10:07:21 +02:00

ShippingZone.php

fix cs

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

Tax.php

fix cs

2013-10-25 10:07:21 +02:00

TaxRule.php

fix cs

2013-10-25 10:07:21 +02:00

Template.php

fix cs

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