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

Conflicts:
	.gitignore
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/page.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/orders/_documents.tpl
	admin-dev/themes/default/template/controllers/orders/_shipping.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/restrictions.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/modules_list/list.tpl
	classes/Tools.php
	controllers/admin/AdminCartRulesController.php
	controllers/admin/AdminProductsController.php
	css/admin.css

2013-07-24 17:01:23 +02:00

..

cropper

// Welcome 2013

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

jquery

[*] FO : updated Fancybox plug-in

2013-07-23 12:53:20 +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_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-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-07-24 17:01:23 +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-07-24 17:01:23 +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

// Welcome 2013

2013-01-04 11:19:03 +01: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 : fix #PSCFV-2961

2012-06-29 07:22:00 +00: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

[-] FO : Fix bug #PSCFV-8202 special chars for checkCustomizations js function

2013-03-21 15:09:02 +01:00