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

# By Etienne Roudeix (1) and others
# Via Etienne Roudeix (2) and Manuel Raynaud (2)
* 'master' of https://github.com/thelia/thelia:
  clean some code
  fix phpdoc
  Added windows version of reset_install script

2013-09-09 10:04:57 +02:00

..

Action

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

2013-09-08 00:08:02 +02:00

Cart

add some phpdoc

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

Command

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

2013-09-08 00:08:02 +02:00

Config

WIP

2013-09-09 10:03:00 +02:00

Constraint

WIP

2013-09-09 10:03:00 +02:00

Controller

WIP

2013-09-09 10:03:00 +02:00

Core

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

2013-09-09 10:04:57 +02:00

Coupon

WIP

2013-09-08 17:36:21 +02:00

Exception

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

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

Form

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

2013-09-08 00:08:02 +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

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

2013-09-08 00:08:02 +02:00

Module

country id can be an argument for calculate method

2013-09-06 17:34:25 +02:00

Rewriting

rewriting router

2013-09-06 08:59:06 +02:00

Tests

WIP

2013-09-08 18:00:31 +02:00

Tools

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

2013-09-08 00:08:02 +02:00

Type

Merge branch 'master' into loops

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