gmorel 94e2d7881d Merge branch 'master' of git://github.com/thelia/thelia into french_translation ...

* 'master' of git://github.com/thelia/thelia:
  fix typo
  Implemented mail messages templates and layouts
  Email template + test email

2013-11-27 22:22:26 +01:00

..

ajax

Merge master

2013-11-27 20:24:38 +01:00

assets

Merge branch 'master' of git://github.com/thelia/thelia into french_translation

2013-11-27 22:22:26 +01:00

configs

Merge master

2013-11-27 20:24:38 +01:00

coupon

Merge master

2013-11-27 20:24:38 +01:00

I18n

Translation : some fre_FR added

2013-11-27 22:20:31 +01:00

includes

Spelling rewritten with 2 t

2013-11-27 20:37:40 +01:00

404.html

change template subdirs

2013-11-13 10:24:14 +01:00

admin-layout.tpl

Merge master

2013-11-27 20:24:38 +01:00

admin-logs.html

change template subdirs

2013-11-13 10:24:14 +01:00

administrators.html

Merge master

2013-11-27 20:24:38 +01:00

attribute-edit.html

Merge master

2013-11-27 20:24:38 +01:00

attributes.html

Merge master

2013-11-27 20:24:38 +01:00

categories.html

change template subdirs

2013-11-13 10:24:14 +01:00

category-edit.html

Spelling rewritten with 2 t

2013-11-27 20:37:40 +01:00

config-store.html

Merge master

2013-11-27 20:24:38 +01:00

configuration.html

Merge master

2013-11-27 20:24:38 +01:00

content-edit.html

Spelling rewritten with 2 t

2013-11-27 20:37:40 +01:00

countries.html

Merge master

2013-11-27 20:24:38 +01:00

country-edit.html

Merge master

2013-11-27 20:24:38 +01:00

coupon-create.html

change template subdirs

2013-11-13 10:24:14 +01:00

coupon-list.html

change template subdirs

2013-11-13 10:24:14 +01:00

coupon-read.html

change template subdirs

2013-11-13 10:24:14 +01:00

coupon-update.html

change template subdirs

2013-11-13 10:24:14 +01:00

currencies.html

Merge master

2013-11-27 20:24:38 +01:00

currency-edit.html

Merge master

2013-11-27 20:24:38 +01:00

customer-edit.html

Merge master

2013-11-27 20:24:38 +01:00

customers.html

Merge master

2013-11-27 20:24:38 +01:00

document-edit.html

Merge master

2013-11-27 20:24:38 +01:00

feature-edit.html

Merge master

2013-11-27 20:24:38 +01:00

features.html

Merge master

2013-11-27 20:24:38 +01:00

folder-edit.html

Spelling rewritten with 2 t

2013-11-27 20:37:40 +01:00

folders.html

Merge master

2013-11-27 20:24:38 +01:00

general_error.html

change template subdirs

2013-11-13 10:24:14 +01:00

home.html

change template subdirs

2013-11-13 10:24:14 +01:00

image-edit.html

Merge master

2013-11-27 20:24:38 +01:00

languages.html

Merge master

2013-11-27 20:24:38 +01:00

login.html

change template subdirs

2013-11-13 10:24:14 +01:00

mailing-system.html

Merge master

2013-11-27 20:24:38 +01:00

message-edit.html

Merge branch 'master' of git://github.com/thelia/thelia into french_translation

2013-11-27 22:22:26 +01:00

messages.html

Merge branch 'master' of git://github.com/thelia/thelia into french_translation

2013-11-27 22:22:26 +01:00

module-configure.html

Merge master

2013-11-27 20:24:38 +01:00

module-edit.html

Merge master

2013-11-27 20:24:38 +01:00

modules.html

Merge master

2013-11-27 20:24:38 +01:00

order-edit.html

Merge master

2013-11-27 20:24:38 +01:00

orders.html

Merge master

2013-11-27 20:24:38 +01:00

product-edit.html

Merge master

2013-11-27 20:24:38 +01:00

profile-edit.html

Merge master

2013-11-27 20:24:38 +01:00

profiles.html

Merge master

2013-11-27 20:24:38 +01:00

search.html

Merge master

2013-11-27 20:24:38 +01:00

shipping-configuration-edit.html

Merge master

2013-11-27 20:24:38 +01:00

shipping-configuration.html

Merge master

2013-11-27 20:24:38 +01:00

shipping-zones-edit.html

Merge master

2013-11-27 20:24:38 +01:00

shipping-zones.html

Merge master

2013-11-27 20:24:38 +01:00

system-logs.html

Merge master

2013-11-27 20:24:38 +01:00

tax-edit.html

Merge master

2013-11-27 20:24:38 +01:00

tax-rule-edit.html

Merge master

2013-11-27 20:24:38 +01:00

taxes-rules.html

Merge master

2013-11-27 20:24:38 +01:00

template-edit.html

Merge master

2013-11-27 20:24:38 +01:00

templates.html

Merge master

2013-11-27 20:24:38 +01:00

translations.html

Merge master

2013-11-27 20:24:38 +01:00

variable-edit.html

Merge master

2013-11-27 20:24:38 +01:00

variables.html

Merge master

2013-11-27 20:24:38 +01:00