Kevin Granger 67dc7aac04 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap ...

Conflicts:
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/filters.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	classes/Category.php
	classes/controller/AdminController.php
	controllers/admin/AdminAttributesGroupsController.php
	controllers/admin/AdminFeaturesController.php
	controllers/admin/AdminImportController.php
	controllers/admin/AdminLogsController.php
	install-dev/install_version.php
	install-dev/langs/ru/data/tab.xml
	js/admin_carrier_wizard.js
	modules/loyalty/loyalty.php

2013-10-14 12:21:29 +02:00

..

controllers

[*] BO Module productcomments: JS variables are correctly escaped. Padding in error message has also been pushed to theme tpl

2013-10-11 16:37:26 +02:00

img

// Welcome 2013

2013-01-04 11:19:03 +01:00

js

[-] MO productcomments: confirmation message takes moderation mode into account

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

translations

[-] Core: delete lang files

2013-03-21 14:15:55 +01:00

config.xml

//revert all config.xml

2012-12-06 11:41:52 +01:00

index.php

// Welcome 2013

2013-01-04 11:19:03 +01:00

install.sql

[-] BO : #PSFV-750 : add a comment criterion by default

2012-04-05 08:30:13 +00:00

logo.gif

2011-07-06 10:54:11 +00:00

logo.png

// new icon for adminhome, adminmodules and header

2011-11-21 09:21:26 +00:00

ProductComment.php

// Welcome 2013

2013-01-04 11:19:03 +01:00

ProductCommentCriterion.php

// Welcome 2013

2013-01-04 11:19:03 +01:00

productcomments-ajax.php

// Welcome 2013

2013-01-04 11:19:03 +01:00

productcomments-extra.tpl

[-] BO : products comments impossible if quantity > 0

2013-07-03 14:09:44 +02:00

productcomments.css

[-] FO: Fix retrocompatibility for modules and old themes

2012-12-31 12:06:28 +01:00

productcomments.php

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap

2013-10-14 12:21:29 +02:00

productcomments.tpl

[*] BO Module productcomments: JS variables are correctly escaped. Padding in error message has also been pushed to theme tpl

2013-10-11 16:37:26 +02:00

productcommentscriterion.php

// Welcome 2013

2013-01-04 11:19:03 +01:00

ProductCriterion.php

// Welcome 2013

2013-01-04 11:19:03 +01:00

products-comparison.tpl

// Welcome 2013

2013-01-04 11:19:03 +01:00

tab.tpl

// Welcome 2013

2013-01-04 11:19:03 +01:00