mespeche ba645764fc Merge branch 'master' of https://github.com/thelia/thelia ...

Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
	reset_install.sh

2013-09-04 16:05:25 +02:00

..

Action

Merge branch 'rewrite'

2013-09-04 14:45:57 +02:00

Cart

add some phpdoc

2013-09-01 11:32:05 +02:00

Command

refactor install process, database management in dedicated class

2013-09-03 11:09:27 +02:00

Config

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

2013-09-04 16:05:25 +02:00

Controller

Merge branch 'actions'

2013-09-04 10:53:32 +02:00

Core

fix URL::retrieve

2013-09-04 15:15:38 +02:00

Exception

rewriting

2013-09-03 16:51:41 +02:00

Form

Merge branch 'master' of github.com:thelia/thelia

2013-09-04 10:50:13 +02:00

Install

create task for reloaded database

2013-09-03 11:07:32 +02:00

Log

apply cs-fixer

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

Model

fix URL::retrieve

2013-09-04 15:15:38 +02:00

Module

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

Rewriting

fix URL::retrieve

2013-09-04 15:15:38 +02:00

Tests

Merge branch 'actions'

2013-09-04 10:53:32 +02:00

Tools

fix URL::retrieve

2013-09-04 15:15:38 +02:00

Type

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00