Franck Allimant f842f90e00 Merge branch 'master' into tinymce ...

Conflicts:
	local/modules/Tinymce/templates/backOffice/default/include/tinymce_init.tpl

2014-06-19 00:16:21 +02:00

..

Action

The CouponManager clear() method is now invoked.

2014-06-17 00:35:52 +02:00

Cart

change price if needed when customer log in or log out

2014-04-29 11:35:10 +02:00

Command

Code review following pull request comments

2014-06-10 11:43:06 +02:00

Condition

Written coupons unit tests

2014-06-17 19:58:56 +02:00

Config

Added free product coupon.

2014-06-17 00:38:18 +02:00

Controller

fix cs

2014-06-18 10:06:10 +02:00

Core

Merge branch 'master' into tinymce

2014-06-19 00:16:21 +02:00

Coupon

Added missing $this->setFieldsValue($effects);

2014-06-17 15:28:35 +02:00

Exception

Added per-user coupon maximum usage count

2014-05-17 10:56:19 +02:00

Form

Improved and simplified coupon form management

2014-06-11 09:43:09 +02:00

Install

various fixes from insight

2014-06-18 09:33:32 +02:00

Log

change license header

2014-04-18 09:36:41 +02:00

Mailer

change license header

2014-04-18 09:36:41 +02:00

Model

Merge branch 'master' into tinymce

2014-06-19 00:16:21 +02:00

Module

add route parameters to redirectToRoute method in BaseFrontController

2014-04-23 20:48:17 +02:00

Rewriting

change license header

2014-04-18 09:36:41 +02:00

TaxEngine

Free shipping for selected countries and/or shipping methods

2014-05-15 20:25:22 +02:00

Tests

Merge pull request #473 from roadster31/coupon-end

2014-06-17 21:11:14 +02:00

Tools

php cs fixer

2014-04-28 12:30:31 +02:00

Type

change license header

2014-04-18 09:36:41 +02:00