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

Conflicts:
	admin-dev/themes/default/css/modules.css
	admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	classes/Autoload.php
	classes/Carrier.php
	classes/Product.php
	classes/ProductSale.php
	classes/Tools.php
	classes/Validate.php
	classes/tax/TaxRulesTaxManager.php
	controllers/admin/AdminPPreferencesController.php
	controllers/admin/AdminPerformanceController.php
	install-dev/install_version.php
	js/admin_carrier_wizard.js
	modules/blockcategories/blockcategories.php
	modules/blocklayered/blocklayered.php
	modules/statsequipment/statsequipment.php
	modules/statsproduct/statsproduct.php
	modules/watermark/watermark.php
	themes/default/address.tpl
	themes/default/authentication.tpl
	themes/default/category.tpl
	themes/default/contact-form.tpl
	themes/default/css/history.css
	themes/default/header.tpl
	themes/default/js/cart-summary.js
	themes/default/js/product.js
	themes/default/mobile/order-detail.tpl
	themes/default/modules/blocksearch/blocksearch.tpl
	themes/default/modules/productcomments/productcomments.tpl
	themes/default/order-carrier.tpl
	themes/default/order-detail.tpl
	themes/default/order-opc-new-account.tpl
	themes/default/product.tpl

2013-11-21 17:43:51 +01:00

..

access.xml

// Removed administrator account from the installer, replaced by the superadministrator account

2013-10-16 15:40:30 +02:00

address.xml

[*] Bo : #PSTEST-1095 : Remove id_address of the table table supplier and add a new fixture in the installer for the table address

2012-03-27 09:20:01 +00:00

alias.xml

// install-new renamed to install-dev

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

attribute_group.xml

// install-new renamed to install-dev

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

attribute.xml

// Miss files

2012-09-18 08:35:35 +00:00

carrier_group.xml

// install-new renamed to install-dev

2012-01-26 17:35:54 +00: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

// Fix fixtures install

2012-02-24 09:35:08 +00:00

cart_product.xml

// install-new renamed to install-dev

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

cart.xml

// Fix id_shop in cart fixtures

2012-05-25 09:38:13 +00:00

category_group.xml

// install-new renamed to install-dev

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

category_product.xml

// Good positions for category_product in installer

2012-04-19 13:08:18 +00:00

category.xml

// Fix position for category_product in installer

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

connections.xml

// Fix fixtures installer

2013-02-22 10:43:54 +01:00

customer.xml

[-] BO : Bug with genders icons

2013-03-06 18:56:24 +01:00

delivery.xml

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

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

feature_value.xml

// install-new renamed to install-dev

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

feature.xml

// install-new renamed to install-dev

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

guest.xml

// install-new renamed to install-dev

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

image.xml

// install-new renamed to install-dev

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

index.php

// Welcome 2013

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

manufacturer.xml

// install-new renamed to install-dev

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

order_carrier.xml

// install-new renamed to install-dev

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

order_detail.xml

[-] BO: Invoices and products order detail are now not empty after deleting a product

2012-08-07 12:20:10 +00:00

order_history.xml

// install-new renamed to install-dev

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

order_message.xml

// install-new renamed to install-dev

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

orders.xml

// John Doe is really a big scammer ! #PSCFV-9434

2013-07-08 11:17:12 +02:00

product_attribute_combination.xml

// Fix apple fixtures language

2012-09-17 13:28:56 +00:00

product_attribute_image.xml

// install-new renamed to install-dev

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

product_attribute.xml

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

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

product_supplier.xml

[-] BO : Fix bug #PSCFV-10666 product_supllier currency set to 0

2013-11-07 11:24:32 +01:00

product.xml

// Added references to demo products

2013-01-31 17:04:59 +01:00

profile.xml

// Removed administrator account from the installer, replaced by the superadministrator account

2013-10-16 15:40:30 +02:00

range_price.xml

// install-new renamed to install-dev

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

range_weight.xml

// install-new renamed to install-dev

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

scene.xml

// install-new renamed to install-dev

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

specific_price.xml

// Fix iPod nano fixture specific price

2013-03-12 18:11:20 +01:00

stock_available.xml

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

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

store.xml

// install-new renamed to install-dev

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

supplier.xml

// install-new renamed to install-dev

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

tag.xml

// install-new renamed to install-dev

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