Franck Allimant 5bf51dd47e Merge branch 'catalog' ...

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Config/Resources/routing/admin.xml
	core/lib/Thelia/Core/Template/Loop/Country.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
	core/lib/Thelia/Model/Country.php
	core/lib/Thelia/Model/Profile.php
	core/lib/Thelia/Model/ProfileQuery.php
	install/insert.sql
	install/thelia.sql
	local/config/schema.xml

2013-10-24 00:16:33 +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

Working : Refactor adapter into facade

2013-10-10 22:29:53 +02:00

import.php

update import using propel collection in all save methods

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

insert.sql

Merge branch 'catalog'

2013-10-24 00:16:33 +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

Worked on catalog

2013-10-23 23:41:39 +02:00