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

Conflicts:
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/home/content.tpl
	admin-dev/themes/default/template/controllers/localization/content.tpl
	admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
	admin-dev/themes/default/template/controllers/orders/_new_product.tpl
	admin-dev/themes/default/template/controllers/orders/_product_line.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
	admin-dev/themes/default/template/footer.tpl
	controllers/admin/AdminCarrierWizardController.php
	controllers/admin/AdminCarriersController.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminLocalizationController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminSuppliersController.php
	css/admin.css
	js/admin-products.js
	js/admin_carrier_wizard.js
	translations/fr.gzip

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

..

cropper

// Welcome 2013

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

jquery

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

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

tiny_mce

// Welcome 2013

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

.htaccess

//small fix

2011-10-04 16:25:08 +00:00

admin_carrier_wizard.js

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

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

admin_order.js

[-] BO : Fix bug #PSCFV-8619 update order weight when modifying products

2013-07-01 11:32:09 +02:00

admin-categories-tree.js

// Welcome 2013

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

admin-dashboard.js

//dashactivity configuration

2013-09-12 10:08:28 +02:00

admin-dnd.js

[-] FO : Apply changes from commit 1.4.X 1d0d59845b5f9cb9333a89e60523ab41df076d89 no cache for POST queries

2013-01-23 15:48:15 +01:00

admin-products.js

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

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

admin-scene-cropping.js

// Welcome 2013

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

admin-translations.js

// Welcome 2013

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

admin.js

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

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

adminImport.js

// Welcome 2013

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

ajax.js

// Welcome 2013

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

attributesBack.js

// Welcome 2013

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

checkLangPack.js

[-] BO : Fix bug #PSCFI-7231 strtolower iso_lang for package download link

2013-05-27 18:13:13 +02:00

date.js

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

fileuploader.js

// license

2013-02-25 17:27:33 +01:00

form.js

/////

2013-08-29 17:21:27 +02:00

gg-translate.js

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

helpAccess.js

// remove notification for helpAccess calls

2012-04-05 09:57:16 +00:00

hookLiveEdit.js

[-] FO : fixed entities issue in javascript alerts #PSCFV-9001

2013-06-26 16:22:57 +02:00

index.php

// Welcome 2013

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

login.js

[-] BO : FixBug #PSCFV-9878 Wrong login tab order

2013-07-22 17:07:57 +02:00

notifications.js

[-] BO : fixed notifications when there is too much data

2013-09-10 09:17:54 +02:00

pluginDetect.js

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

price.js

// Welcome 2013

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

productTabsManager.js

[-] FO : Apply changes from commit 1.4.X 1d0d59845b5f9cb9333a89e60523ab41df076d89 no cache for POST queries

2013-01-23 15:48:15 +01:00

retro-compat.js.php

// Fix treeview retro compat

2012-05-03 08:13:20 +00:00

sendMailTest.js

[-] BO : Fix bug #PSCFI-6755 "+" in email

2013-05-23 16:14:31 +02:00

tinymce.inc.js

[+] BO Wip BS -> Products + fix

2013-07-05 18:36:42 +02:00

toggle.js

// Welcome 2013

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

toolbar.js

[-] BO : fixed bug #PSCFV-2652

2012-06-01 15:13:04 +00:00

tools.js

[-] MO productcomments :

2013-09-06 17:54:12 +02:00