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

Conflicts:
	core/lib/Thelia/Action/BaseAction.php
	core/lib/Thelia/Controller/Admin/AbstractSeoCrudController.php
	core/lib/Thelia/Controller/Admin/ProductController.php
	core/lib/Thelia/Core/Event/UpdateSeoEvent.php
	core/lib/Thelia/Form/ProductModificationForm.php
	core/lib/Thelia/Form/SeoFieldsTrait.php
	core/lib/Thelia/Model/Base/Product.php
	core/lib/Thelia/Model/Base/ProductI18n.php
	core/lib/Thelia/Model/Base/ProductI18nQuery.php
	core/lib/Thelia/Model/Map/ProductI18nTableMap.php
	core/lib/Thelia/Model/Map/ProductTableMap.php
	install/thelia.sql
	local/config/schema.xml
	templates/backOffice/default/includes/product-general-tab.html
	templates/backOffice/default/includes/seo-tab.html
	templates/backOffice/default/product-edit.html

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

..

Action

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

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

Cart

refactor cart events

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

Command

tweak httpFoundation cache part for compatibility with

2013-11-20 14:45:40 +01:00

Condition

Coupon : Fix namespace issues

2013-11-24 22:05:58 +01:00

Config

Add SEO Meta to CATEGORY/PRODUCT/FOLDER/CONTENT

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

Controller

Add SEO Meta to CATEGORY/PRODUCT/FOLDER/CONTENT

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

Core

Add SEO Meta to CATEGORY/PRODUCT/FOLDER/CONTENT

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

Coupon

Coupon : Fix namespace issues

2013-11-24 22:05:58 +01:00

Exception

rewritten url update

2013-12-06 16:35:14 +01:00

Form

Add SEO Meta to CATEGORY/PRODUCT/FOLDER/CONTENT

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

Install

fix typo

2013-11-13 15:15:53 +01:00

Log

Fixed exception when log file could not be renamed

2013-12-05 13:01:43 +01:00

Mailer

mailing sytem admin

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

Model

Rename meta_keyword to meta_keywords

2013-12-09 14:52:46 +01:00

Module

change request class in BaseModule

2013-11-07 16:53:49 +01:00

Rewriting

change place where absolute url is create when rewritten url is enabled

2013-10-21 15:15:17 +02:00

TaxEngine

end tax edition

2013-10-17 11:53:26 +02:00

Tests

test rewriting

2013-12-09 13:01:39 +01:00

Tools

test rewriting

2013-12-09 13:01:39 +01:00

Type

fix cs

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