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

..

ajaxfilemanager

[-] BO : Upload image name with trailing slash in name

2013-06-15 01:55:02 +02:00

autoupgrade

// Welcome 2013

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

backups

// Welcome 2013

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

export

// Welcome 2013

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

import

// Welcome 2013

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

tabs

// Welcome 2013

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

themes

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

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

ajax_products_list.php

//replace dirname(__FILE__) by _PS_ADMIN_DIR_ to prevent cache bug with __FILE__

2013-03-11 15:10:22 +01:00

ajax-tab.php

//replace dirname(__FILE__) by _PS_ADMIN_DIR_ to prevent cache bug with __FILE__

2013-03-11 15:10:22 +01:00

ajax.php

// Replaced screencast option by menu option

2013-09-12 18:24:18 +02:00

backup.php

// changed English strings, especially focusing on colons harmonization

2013-03-12 19:39:30 +01:00

cron_currency_rates.php

// Welcome 2013

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

displayImage.php

//replace dirname(__FILE__) by _PS_ADMIN_DIR_ to prevent cache bug with __FILE__

2013-03-11 15:10:22 +01:00

drawer.php

[-] BO : fixed charts and grids in multishop #PSCFV-8978

2013-07-12 16:29:31 +02:00

footer.inc.php

Merge branch 'translate' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-translate

2013-07-17 16:31:49 +02:00

functions.php

// Fix upgrade and dashboard

2013-10-11 14:07:03 +02:00

get-file-admin.php

[-] BO : fix require path to config.inc.php

2013-06-13 17:59:01 +02:00

grider.php

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

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

header.inc.php

// Code cleaning

2013-10-11 15:35:45 +02:00

index.php

[-] BO : Retro compat, PS_ADMIN_DIR not defined //bad commit sorry

2013-10-07 11:24:42 +02:00

init.php

// sometimes, translations files could not exist

2013-10-04 13:19:34 +02:00

login.php

// Welcome 2013

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

password.php

[*] BO: use Translate::getAdminTranslation instead of translate()

2013-06-01 00:21:28 +02:00

pdf.php

// Welcome 2013

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

searchcron.php

//replace dirname(__FILE__) by _PS_ADMIN_DIR_ to prevent cache bug with __FILE__

2013-03-11 15:10:22 +01:00

uploadProductFile.php

[-] BO : bad initialization of context due to miss define of _PS_ADMIN_DIR_ in displayImage.php

2013-01-09 10:33:57 +01:00

uploadProductFileAttribute.php

[-] BO : bad initialization of context due to miss define of _PS_ADMIN_DIR_ in displayImage.php

2013-01-09 10:33:57 +01:00