dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,989 Commits 9 Branches 19 Tags
0af76e01fb303fa6eeb7ee7a78755d2bc8dfd708
Commit Graph
27 Commits
Author SHA1 Message Date
Damien Metzger c095d8f1ca [-] Core : fixed smarty escape htmlall > html 2013-11-22 09:47:15 +01:00
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
gRoussac c1969028f2 [-] FO : Customized meesage with carriage return follow up #962 2013-11-12 10:41:19 +01:00
gRoussac aefa821d7f [*] MO : TM - Blockcart added Layer 2013-10-21 16:55:47 +02:00
Damien Metzger ca64179950 // W3C 2013-06-06 15:27:29 +02:00
Damien Metzger 49b5d3ab02 [-] FO : fixed truncate and entities in the cart block #PSCFV-8870 2013-04-29 10:52:44 +02:00
gRoussac 0bcadd5d8d // withdraw empty lines, convert line feeds to \r\n 2013-02-26 10:58:03 +01:00
Rémi Gaillard 9a231ac737 [-] MO: Display real price instead of Free for product which are not gifts on blockcart #PSCFV-6423 2013-02-05 18:25:40 +01:00
Francois Gaillard 8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
mDeflotte 1f41296774 [-] MO : #PSCFV-3274 - No links to remove discounts without code in module blockcart 2012-07-20 08:54:47 +00:00
mDeflotte 8e2fee146d [-] MO : #PSCFV-3057 - Block cart: If no products, block cart is never displayed 2012-07-05 15:04:20 +00:00
mDeflotte 70c4cc943e [-] FO : #PSTEST-990 - Fix bug with bad ajax return on adding product to the cart with a new cart reduction applyed 2012-03-14 13:40:39 +00:00
rMalie 1dc629a949 // Welcome 2012² 2012-02-23 16:33:10 +00:00
dMetzger b55bf82af6 [-] FO : ajax cart now display cart rules correctly #PSTEST-724 
// Small addition to the controller override
 2012-02-22 11:02:49 +00:00
mMarinetti 677a4e485c // Welcome 2012 2012-02-22 09:28:22 +00:00
mDeflotte 1fe91c0267 // Fixing problems with blockcart 2011-12-22 16:56:10 +00:00
mDeflotte aceac79994 // Fix blockcart removing products 2011-12-21 18:09:48 +00:00
rMalie 31ab97428a // Remove useless prefix in blockcart json template 2011-12-06 09:16:58 +00:00
mDeflotte 0df1a7e2eb // Merging multishipping branche on 1.5 2011-11-18 11:13:31 +00:00
vChabot 95cde12b84 [*] FO : combination link from product page are now the same as the combination link from blocklayered 
// Cart is now accepting the combination link
 2011-11-10 10:45:19 +00:00
rMalie 668a8d333c [+] MO: Add Module->smartyAssign method, in order to assign variables with module name as prefix in module's templates 2011-09-22 12:05:49 +00:00
rMalie 3f9a9e41d7 // id_shop on cart product (for links) + change Shop::sqlAsso() + share_order 2011-07-22 08:57:51 +00:00
rGaillard 8fc7f11014 2011-07-06 10:54:11 +00:00
rGaillard d1a13007b9 2011-07-06 10:10:43 +00:00
fBrignoli 1bb4a61a42 [+] Dispatcher 2011-06-15 16:32:06 +00:00
aFolletete 05a58f53e6 // 1.5 branche creation 2011-04-12 18:24:40 +00:00