Manuel Raynaud 0f46e9d23a Merge branch 'master' of github.com:thelia/thelia ...

Conflicts:
	templates/admin/default/coupon-read.html

2013-09-10 16:18:15 +02:00

..

Action

WIP

2013-09-10 15:41:23 +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

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

2013-09-10 15:46:51 +02:00

Constraint

WIP

2013-09-09 21:43:58 +02:00

Controller

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

2013-09-10 15:41:59 +02:00

Core

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

2013-09-10 15:41:59 +02:00

Coupon

WIP

2013-09-09 16:40:53 +02:00

Exception

Merge branch 'tax'

2013-09-09 16:28:32 +02:00

Form

integrate new customer creation form

2013-09-10 16:13:53 +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

defin currency at runtime

2013-09-09 21:00:28 +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

TaxEngine

unit testing for tax engine calculator

2013-09-09 17:43:58 +02:00

Tests

fix tests

2013-09-09 18:49:21 +02:00

Tools

complete login form

2013-09-10 12:16:19 +02:00

Type

Merge branch 'master' into loops

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