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

..

classes

//MERGE branche release

2013-08-26 10:59:36 +02:00

controllers

// small change on fixtures installation

2013-08-05 20:33:39 +02:00

data

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

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

dev

// Installer can be translated at /install-dev/dev/translate.php

2013-02-27 14:53:51 +01:00

fixtures

[+] TR: Created file structure for Dutch installer

2013-07-19 15:34:10 +00:00

langs

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

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

models

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

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

theme

// Updated installer

2013-08-06 15:53:59 +02:00

upgrade

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

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

index_cli.php

// small changes on php cli installer

2013-04-02 17:28:45 +02:00

index.php

[-] Installer : added ob_start() (required with the cookie mode when debug mode is activated)

2013-08-19 10:04:23 +02:00

init.php

[-] Installer : added ob_start() (required with the cookie mode when debug mode is activated)

2013-08-19 10:04:23 +02:00

install_version.php

//new install version for gamification & bootstrap compatibility

2013-09-04 23:16:56 +02:00