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

..

Rest

Working : Upload image : Fix upload validation

2013-09-23 16:52:50 +02:00

DateTimeFormat.php

fix cs

2013-09-11 08:27:40 +02:00

DIGenerator.php

Fix source header alignment

2013-07-17 15:06:53 +02:00

FileManager.php

fix cs

2013-09-30 10:35:34 +02:00

I18n.php

fix cs

2013-09-30 10:35:34 +02:00

Image.php

fix cs

2013-09-30 10:35:34 +02:00

NumberFormat.php

Worked on catalog

2013-10-23 23:47:44 +02:00

PhpUnitUtils.php

fix cs

2013-09-11 08:27:40 +02:00

Redirect.php

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

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

URL.php

change place where absolute url is create when rewritten url is enabled

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