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

..

bootstrap

Working : Cleanup admin new version bootstrap v3

2013-09-04 15:34:29 +02:00

bootstrap-editable

Working : Add of bootstrap-editable in good directories

2013-09-05 11:14:31 +02:00

bootstrap-select

- Adding of bootstrap-select

2013-09-19 12:31:46 +02:00

bootstrap-switch

Working : Resize countries flag + Add bootstrap-switch

2013-09-06 10:16:08 +02:00

jqplot

- Setting dashboard view with jqplot plugin

2013-09-18 11:53:39 +02:00

libs

allow to load jquery offline

2013-09-23 11:44:05 +02:00

tablesorter

WIP

2013-09-02 16:39:57 +02:00

coupon.js

WIP : Coupon : Fix condition edition

2013-09-27 15:57:56 +02:00

document-upload.js

Working : Fix : Image Management + Document Management

2013-09-24 18:41:28 +02:00

dropzone.js

Working : Image management set on Category

2013-09-22 20:50:42 +02:00

image-upload.js

Working : images : enhance display

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

jquery.min.js

set execution right // no more troubles

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

jquery.typewatch.js

Worked on catalog

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

json2.js

WIP

2013-09-10 15:41:23 +02:00

main.js

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

2013-09-25 14:51:42 +02:00