Etienne Roudeix 99038e688a Revert "Revert "Merge branch 'cleanmaster' into modules"" ...

This reverts commit b3ac365b45.

Conflicts:
	Readme.md
	core/lib/Thelia/Controller/Admin/AbstractCrudController.php
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Model/Base/Coupon.php
	core/lib/Thelia/Model/Base/CouponQuery.php
	core/lib/Thelia/Model/Base/CouponVersion.php
	core/lib/Thelia/Model/Base/CouponVersionQuery.php
	core/lib/Thelia/Model/Base/OrderCouponQuery.php

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

..

ajax

Merge master

2013-12-04 14:42:15 +01:00

assets

Coupon : Condition module : add tooltip on condition select

2014-01-05 20:17:30 +01:00

configs

Merge master

2013-12-04 14:42:15 +01:00

coupon

Coupon : Condition module : add tooltip on condition select

2014-01-05 20:17:30 +01:00

I18n

Prevent product and content création at catalog root

2013-12-20 14:51:47 +01:00

includes

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

2013-12-30 00:58:43 +01:00

404.html

change template subdirs

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

admin-layout.tpl

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

admin-logs.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

administrators.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

attribute-edit.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

attributes.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

categories.html

Prevent product and content création at catalog root

2013-12-20 14:51:47 +01:00

category-edit.html

Prevent product and content création at catalog root

2013-12-20 14:51:47 +01:00

config-store.html

Prevent product and content création at catalog root

2013-12-20 14:51:47 +01:00

configuration.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

content-edit.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

countries.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

country-edit.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

coupon-create.html

Coupon : Condition module refactor

2014-01-05 00:00:15 +01:00

coupon-list.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

coupon-read.html

Coupon : Condition module refactor

2014-01-05 00:00:15 +01:00

coupon-update.html

Coupon : Condition module refactor

2014-01-05 00:00:15 +01:00

currencies.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

currency-edit.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

customer-edit.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

customers.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

document-edit.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

feature-edit.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

features.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

folder-edit.html

uncomment needed loop for parent folder

2013-12-29 17:18:52 +01:00

folders.html

Use $parent instead of $folder_id in folders admin template

2013-12-29 17:18:52 +01:00

general_error.html

change template subdirs

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

home.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

image-edit.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

languages.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

login.html

change template subdirs

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

mailing-system.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

message-edit.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

messages.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

module-configure.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

module-edit.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

modules.html

Merge branch 'master' into modules

2013-12-17 10:48:59 +01:00

order-edit.html

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

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

orders.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

product-edit.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

profile-edit.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

profiles.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

search.html

Merge branch 'master' into modules

2013-12-17 10:48:59 +01:00

shipping-configuration-edit.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

shipping-configuration.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

shipping-zones-edit.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

shipping-zones.html

change loop in shipping zone template using module insteadof delivery

2013-12-20 09:25:37 +01:00

system-logs.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

tax-edit.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

tax-rule-edit.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

taxes-rules.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

template-edit.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

templates.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

translations.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

variable-edit.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00

variables.html

add a new entry point in each pages in bo for js include

2013-12-17 10:21:18 +01:00