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

..

access.xml

//added dashboard controller

2013-08-28 10:04:28 +02:00

address_format.xml

// Added state on the address format for more countries (JP, AR, ID, MX)

2012-10-03 07:32:38 +00:00

carrier_group.xml

// Default carrier groups updated

2013-03-25 12:13:53 +01:00

carrier_tax_rules_group_shop.xml

// Fix tax_rules_group install on carriers and products

2012-02-24 09:41:31 +00:00

carrier_zone.xml

// install-new renamed to install-dev

2012-01-26 17:35:54 +00:00

carrier.xml

// install-new renamed to install-dev

2012-01-26 17:35:54 +00:00

category_group.xml

// install-new renamed to install-dev

2012-01-26 17:35:54 +00:00

category.xml

// Fix position for category_product in installer

2012-04-17 16:46:26 +00:00

cms_category.xml

// install-new renamed to install-dev

2012-01-26 17:35:54 +00:00

cms.xml

// install-new renamed to install-dev

2012-01-26 17:35:54 +00:00

configuration.xml

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

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

contact.xml

// install-new renamed to install-dev

2012-01-26 17:35:54 +00:00

country.xml

[-] Installer : changed Guam zone #PSCFV-3134

2012-07-11 08:01:08 +00:00

delivery.xml

// MERGE product_multistore branch : product fields are now editable per shop

2012-04-17 13:32:12 +00:00

gender.xml

[-] INSTALLER : Fix crash from genders jpg copy

2013-03-06 21:16:24 +01:00

group.xml

// install-new renamed to install-dev

2012-01-26 17:35:54 +00:00

hook_alias.xml

[-] INSTALLER : Add hook alias - #PSCFV-2742

2012-07-02 08:59:09 +00:00

hook.xml

[-] BO : FixBug #PSCFV-9049 Bad actionOrderSlipAdd hook description

2013-07-19 16:30:04 +02:00

image_type.xml

// Renamed images types for the default theme (in order to avoid conflicts) #PSCFV-4242

2012-09-21 14:59:51 +00:00

index.php

// Welcome 2013

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

meta.xml

// Order confirmation meta data installation fixed

2013-02-25 10:05:40 +01:00

operating_system.xml

// Browsers and OS updated

2012-09-28 15:09:10 +00:00

order_return_state.xml

// install-new renamed to install-dev

2012-01-26 17:35:54 +00:00

order_state.xml

[-] CORE : order state preparation now generate delivery slip

2013-02-05 10:15:53 +01:00

profile.xml

// install-new renamed to install-dev

2012-01-26 17:35:54 +00:00

quick_access.xml

// Colored switch, removed "required field" legend, removed duplicate links quick access

2013-09-04 18:14:11 +02:00

risk.xml

// Fixed typo #PSCFV-2995

2012-07-03 07:43:31 +00:00

search_engine.xml

// install-new renamed to install-dev

2012-01-26 17:35:54 +00:00

state.xml

// install-new renamed to install-dev

2012-01-26 17:35:54 +00:00

stock_mvt_reason.xml

// install-new renamed to install-dev

2012-01-26 17:35:54 +00:00

supply_order_state.xml

// install-new renamed to install-dev

2012-01-26 17:35:54 +00:00

tab.xml

//added dashboard controller

2013-08-28 10:04:28 +02:00

theme.xml

// install-new renamed to install-dev

2012-01-26 17:35:54 +00:00

timezone.xml

// install-new renamed to install-dev

2012-01-26 17:35:54 +00:00

warehouse.xml

// install-new renamed to install-dev

2012-01-26 17:35:54 +00:00

web_browser.xml

// Browsers and OS updated

2012-09-28 15:09:10 +00:00

zone.xml

[-] Installer : BugFix : #PSTEST-938 : spelling mistake fixed

2012-03-05 13:40:47 +00:00