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

..

Action

Merge branch 'catalog'

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

Cart

refactor cart events

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

Command

administrators management

2013-10-23 16:31:37 +02:00

Condition

Working cleaning

2013-10-21 23:09:04 +02:00

Config

Merge branch 'catalog'

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

Controller

Merge branch 'catalog'

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

Core

Merge branch 'catalog'

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

Coupon

Working adding decrementation when coupon is consumed

2013-10-22 23:04:08 +02:00

Exception

fix tests

2013-10-07 14:36:20 +02:00

Form

Merge branch 'catalog'

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

Install

Merge pull request #8 from thelia/fixtures_for_modules

2013-10-07 00:16:02 -07:00

Log

apply cs-fixer

2013-08-14 09:29:04 +02:00

Mailer

fix typo

2013-09-16 19:08:01 +02:00

Model

Merge branch 'catalog'

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

Module

end module removal

2013-10-21 11:30:19 +02: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

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

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

Tools

Merge branch 'catalog'

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

Type

permission management

2013-10-22 11:09:24 +02:00