Kevin Granger 9e5bbac559 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap ...

# By Jérôme Nadaud (4) and sLorenzini (1)
# Via Jérôme Nadaud
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop:
  [-] BO : BugFix Cancel modification button error
  [+] BO : Product "For" and combination button
  // update order tab
  [+] BO : Product "For"
  [+] BO : Product "For" and new carriers select list

Conflicts:
	admin-dev/themes/default/css/admin-theme.css

2013-07-25 19:21:59 +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 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

2013-07-25 19:21:59 +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

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

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

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

2013-07-17 16:31:49 +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

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

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

index.php

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

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

init.php

// Welcome 2013

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