dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Kevin Granger
2013-11-21 17:43:51 +01:00
parent 6431f559d7 d6e52bdecb
commit 9eefcfd058
167 changed files with 7261 additions and 861 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/crossselling/config.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<module>
<name>crossselling</name>
<displayName><![CDATA[Cross Selling]]></displayName>
<version><![CDATA[0.7]]></version>
<version><![CDATA[0.8]]></version>
<description><![CDATA[Customers who bought this product also bought:]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
modules/crossselling/crossselling.php
+1 -4
View File
@@ -35,7 +35,7 @@ class CrossSelling extends Module
{
$this->name = 'crossselling';
$this->tab = 'front_office_features';
$this->version = 0.7;
$this->version = 0.8;
$this->author = 'PrestaShop';
$this->need_instance = 0;
@@ -44,9 +44,6 @@ class CrossSelling extends Module
$this->displayName = $this->l('Cross Selling');
$this->description = $this->l('Customers who bought this product also bought:');
if (!$this->isRegisteredInHook('header'))
$this->registerHook('header');
}
public function install()
modules/crossselling/upgrade/install-0.8.php
+11
View File
@@ -0,0 +1,11 @@
<?php
if (!defined('_PS_VERSION_'))
exit;
function upgrade_module_0_8($object)
{
if (!$object->isRegisteredInHook('header'))
return $object->registerHook('header');
return true;
}