Manuel Raynaud 0c564be4c5 Merge branch 'master' of https://github.com/enurit/thelia into enurit-master ...

Conflicts:
	templates/frontOffice/default/I18n/fr_FR.php

2014-01-14 19:21:01 +01:00

..

Action

clear order and consumed coupon in session after processing order. Fix #162

2014-01-10 14:55:52 +01:00

Cart

refactor cart events

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

Command

hide passord on admin creation using CLI

2014-01-13 10:00:20 +01:00

Condition

fix cs

2014-01-10 11:41:55 +01:00

Config

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

2014-01-14 19:21:01 +01:00

Controller

AbstractController::getExistingObject return object with hte needed

2014-01-14 14:39:08 +01:00

Core

move tinymce to resources folder

2014-01-14 10:36:37 +01:00

Coupon

fix cs

2014-01-10 11:41:55 +01:00

Exception

Coupon : Fix mistake with chmod, file mode set as 644 as it originally was

2013-12-30 21:37:26 +01:00

Form

fix cs

2014-01-10 11:41:55 +01:00

Install

fix cs

2014-01-10 11:41:55 +01:00

Log

Revert "Revert "Merge branch 'cleanmaster' into modules""

2014-01-06 11:25:25 +01:00

Mailer

fix cs

2014-01-10 11:41:55 +01:00

Model

check if pbject exists before deleting it

2014-01-10 09:40:33 +01:00

Module

Revert "Revert "Merge branch 'cleanmaster' into modules""

2014-01-06 11:25:25 +01:00

Rewriting

fix cs

2014-01-10 11:41:55 +01:00

TaxEngine

fix cs

2014-01-10 11:41:55 +01:00

Tests

fix cs

2014-01-10 11:41:55 +01:00

Tools

Revert "Revert "Merge branch 'cleanmaster' into modules""

2014-01-06 11:25:25 +01:00

Type

Coupon : Fix mistake with chmod, file mode set as 644 as it originally was

2013-12-30 00:50:04 +01:00