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

..

catalog-breadcrumb.html

fix breadcrumb for content/folder part

2013-09-30 15:13:04 +02:00

confirmation-modal.html

Working : Update to bootstrap3 + Delete js filter for the moment

2013-09-04 17:09:59 +02:00

content-folder-management.html

fix auth loop

2013-10-22 15:57:31 +02:00

document-upload-form.html

WIP : upload documents : add action, ctrl, event

2013-09-24 10:54:52 +02:00

document-upload-list-ajax.html

Working : Add a link on documents

2013-09-24 12:25:19 +02:00

folder-breadcrumb.html

fix usage of ProfilerConnectionWrapper

2013-09-30 15:35:46 +02:00

generic-confirm-dialog.html

Fixed product update process

2013-09-20 17:17:44 +02:00

generic-create-dialog.html

finish language creation process

2013-10-23 12:38:32 +02:00

generic-js-dialog.html

Finished product multiple categories attachment

2013-09-22 22:14:39 +02:00

generic-warning-dialog.html

permission cleanup

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

image-upload-form.html

WIP : upload document : add forms

2013-09-23 18:13:12 +02:00

image-upload-list-ajax.html

Working : images : enhance display

2013-09-26 15:26:45 +02:00

inner-form-toolbar.html

Finished combination creation GUI

2013-09-23 11:41:14 +02:00

module-block.html

fix auth loop

2013-10-22 15:57:31 +02:00

notifications.html

Merge branch 'master' of https://github.com/thelia/thelia into coupon

2013-09-04 12:01:12 +02:00

product-details-tab.html

Merge branch 'catalog'

2013-10-24 00:16:33 +02:00

product-general-tab.html

Finished product multiple categories attachment

2013-09-22 22:14:39 +02:00

standard-description-form-fields.html

Finished product multiple categories attachment

2013-09-22 22:14:39 +02:00