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

..

cropper

// Welcome 2013

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

jquery

[*] BO Module search: Quick search can now search modules by name and not only display name

2013-10-07 11:34:16 +02:00

tiny_mce

// Removed useless tiny mce src

2013-09-20 18:52:42 +02:00

vendor

// feedback button

2013-10-11 18:26:12 +02: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-10-14 12:21:29 +02:00

admin_order.js

// fix Orders

2013-10-07 18:54:28 +02:00

admin-categories-tree.js

// Welcome 2013

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

admin-dashboard.js

//added warning domaine on dashboard && prestashop news improve

2013-09-16 10:59:42 +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

// Fix enable friendly url button generator on multishop

2013-10-01 16:44:03 +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-10-14 12:21:29 +02:00

adminImport.js

[-] BO : Could noty save ImportMatchs

2013-10-03 11:15:03 +02: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

// login flip WIP

2013-10-14 09:57:02 +02:00

notifications.js

// Fix notifications

2013-10-10 11:02:33 +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

__DIR__ was never defined

2013-10-04 17:18:23 -07:00

sendMailTest.js

// Advanced parameters bootstrap design

2013-09-25 15:15:28 +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

// Fix warning

2013-09-25 11:43:14 +02:00

tools.js

[-] MO productcomments :

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

validate.js

// Added javascript validation functions (demo)

2013-10-04 15:24:50 +02:00