Etienne Roudeix abe45c5798 Merge branch 'master' into tax ...

Conflicts:
	core/lib/Thelia/Config/Resources/action.xml
	core/lib/Thelia/Controller/Admin/AddressController.php
	core/lib/Thelia/Controller/Admin/CustomerController.php
	core/lib/Thelia/Controller/Admin/ModuleController.php

2013-10-21 17:48:13 +02:00

..

faker-assets

Merge branch 'master' into loops

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

import

fix product import

2013-09-19 18:47:12 +02: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

fix tests

2013-10-07 14:36:20 +02:00

faker.php

Merge branch 'master' into tax

2013-09-27 13:35:39 +02:00

import.php

update import using propel collection in all save methods

2013-09-30 09:31:34 +02:00

insert.sql

update countries list

2013-10-21 14:21:32 +02:00

INSTALL-TODO.txt

Created AbstractCrudController, and refactored existing controllers

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

tax_faker.php

WIP : Refactor contraint/rule becomes conditions (more generic)

2013-09-25 16:36:14 +02:00

thelia.sql

permission cleanup

2013-10-21 17:44:17 +02:00