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

..

AddressController.php

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

2013-11-04 14:43:01 +01:00

AddressesController.php

// changed English strings, especially focusing on colons harmonization

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

AttachmentController.php

[-] FO: Fix #PSCFV-9057 close output buffer before sending attachment and virtualproducts

2013-05-14 18:13:07 +02:00

AuthController.php

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

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

BestSalesController.php

// add colors on some controllers

2013-10-09 16:47:47 +02:00

CartController.php

Send noindex header to avoid ghost carts by bots

2013-09-19 22:15:00 -07:00

CategoryController.php

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

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

ChangeCurrencyController.php

// Welcome 2013

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

CmsController.php

[*] FO : https on TOS in fancybox, follow up https://github.com/PrestaShop/PrestaShop/pull/956

2013-11-12 15:56:04 +01:00

CompareController.php

// Assigned compared products to smarty

2013-11-04 11:00:50 +01:00

ContactController.php

// validator on message field

2013-11-04 14:21:42 +01:00

DiscountController.php

[-] FO : fixed retro compatibility issue with discounts #PSCFV-7553

2013-02-04 11:53:06 +01:00

GetFileController.php

[-] FO: Fix #PSCFV-9057 close output buffer before sending attachment and virtualproducts

2013-05-14 18:13:07 +02:00

GuestTrackingController.php

// changed English strings, especially focusing on colons harmonization

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

HistoryController.php

// Welcome 2013

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

IdentityController.php

// validators

2013-11-02 10:50:02 +01:00

index.php

// Welcome 2013

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

IndexController.php

[*] FO : New hooks for home tabs

2013-10-16 11:44:55 +02:00

ManufacturerController.php

// add color list to some controllers

2013-10-08 15:39:06 +02:00

MyAccountController.php

// Welcome 2013

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

NewProductsController.php

// add colors on some controllers

2013-10-09 16:47:47 +02:00

OrderConfirmationController.php

// Welcome 2013

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

OrderController.php

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

2013-11-04 14:43:01 +01:00

OrderDetailController.php

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

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

OrderFollowController.php

[-] FO : Fix bug #PSCFV-9653 could not return a custom product

2013-07-05 18:15:27 +02:00

OrderOpcController.php

[*] FO: Follow up https://github.com/PrestaShop/PrestaShop/commit/e86c56172dad2892d5c7e7dbb0908b0f4ffbaae0

2013-11-04 18:20:01 +01:00

OrderReturnController.php

// changed English strings, especially focusing on colons harmonization

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

OrderSlipController.php

// Welcome 2013

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

PageNotFoundController.php

// without hedgehogs is better

2013-08-12 16:50:14 +02:00

ParentOrderController.php

[*] FO : https on TOS in fancybox, follow up https://github.com/PrestaShop/PrestaShop/pull/956

2013-11-12 15:56:04 +01:00

PasswordController.php

[-] BO : FixBug smarty email variable override by blockcontact

2013-08-07 15:09:14 +02:00

PdfInvoiceController.php

Removed unsed code

2013-10-21 10:10:28 +02:00

PdfOrderReturnController.php

// changed English strings, especially focusing on colons harmonization

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

PdfOrderSlipController.php

// changed English strings, especially focusing on colons harmonization

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

PricesDropController.php

// add colors on some controllers

2013-10-09 16:47:47 +02:00

ProductController.php

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

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

SearchController.php

// Small fix with URL rewrite

2013-10-31 15:41:41 +01:00

SitemapController.php

[-] FO : fixed bug #PSCFV-5569 - Trying to get property of non-object in SitemapController

2013-01-10 09:31:46 +01:00

StatisticsController.php

[-] CORE : Fix bug #PSCFI-7168 cast and truncate POST values for statistics.php controller

2013-05-16 18:30:58 +02:00

StoresController.php

[-] Fo : Call Gmaps on https if required

2013-11-12 21:16:09 +01:00

SupplierController.php

// add color list to some controllers

2013-10-08 15:39:06 +02:00