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

Conflicts:
	admin-dev/themes/default/template/controllers/customer_threads/message.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/favorites.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
	admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/associations.tpl
	admin-dev/themes/default/template/controllers/products/combinations.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	classes/ProductSale.php
	classes/helper/HelperList.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminCustomersController.php
	controllers/admin/AdminMetaController.php
	controllers/admin/AdminModulesController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminProductsController.php
	controllers/front/ParentOrderController.php
	install-dev/theme/views/welcome.phtml
	modules/blocknewproducts/blocknewproducts.php
	modules/blocktopmenu/blocktopmenu.php
	modules/importerosc/importerosc.php
	modules/mailalerts/mailalerts.php
	modules/shopimporter/shopimporter.php
	modules/statsstock/statsstock.php
	themes/default/css/product_list.css

2013-11-04 14:43:01 +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-04 14:43:01 +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

// add color list to some controllers

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

ChangeCurrencyController.php

// Welcome 2013

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

CmsController.php

[*] CORE : Manual merge of https://github.com/PrestaShop/PrestaShop/ thanks @kpodemski

2013-10-29 19:05:21 +01:00

CompareController.php

//products comparison link

2013-10-04 16:25:47 +02:00

ContactController.php

[-] BO : Customer message twice encoded

2013-09-12 18:03:30 +02: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

[-] : Fix bug #PSCFV-4859, could not register invoice address or invoice country in OPC as guest, and phone not required in standard registration

2013-10-20 23:52:48 +02: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: Fix bug #PSCFV-10625 Js error on carriers step if AjaxCart disabled

2013-10-24 21:28:22 +02: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

[*] FO: You can now choose the anchor separator for attributes

2013-10-09 11:01:18 +02: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

// changed English strings, especially focusing on colons harmonization

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

SupplierController.php

// add color list to some controllers

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