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

..

faker-assets

Merge branch 'master' into loops

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

import

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

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

.gitkeep

set execution right // no more troubles

2013-06-20 15:21:16 +02:00

faker_100categories_1000products_4locales.php

Implemented "Remember Me" feature on admin. Started template management

2013-09-16 09:23:44 +02:00

faker_add_ecotax.php

Coupon : Fix namespace issues

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

faker.php

Coupon : Condition module refactor

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

import.php

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

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

insert.sql

update insert.sql with new release version

2013-12-20 15:26:29 +01:00

INSTALL-TODO.txt

Created AbstractCrudController, and refactored existing controllers

2013-09-12 13:02:40 +02:00

tax_faker.php

Refactor removing Manager notion

2013-11-23 20:18:04 +01:00

thelia.sql

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

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