dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,644 Commits 9 Branches 19 Tags
5153b49eaeb6dbd20191edcf817f2e3912ce9902
Commit Graph

51 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 5ef392aaeb [-] FO : Fix #PSCFV-11069 remove unused file 2013-11-20 14:44:56 +01:00
gRoussac 947f9bb21c // small isset in productcomments 2013-11-13 16:39:33 +01:00
gRoussac c8dfe1c174 [-] FO : Wordwrap on prices in history 2013-11-12 19:17:12 +01:00
Rémi Gaillard 1dd919addf // no need mobile version with responsive :) 2013-11-05 19:15:24 +01:00
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
Rémi Gaillard 6ef7f258ea // small fix 2013-11-04 10:34:58 +01:00
gRoussac c7323c2bfe [-] CORE : Fix bug #PSCFV-10901 warnings on htmlentities 2013-11-03 22:59:04 +01:00
gRoussac aefa821d7f [*] MO : TM - Blockcart added Layer 2013-10-21 16:55:47 +02:00
gRoussac 62aaf16d60 [*] FO : New hooks for home tabs 2013-10-16 11:44:55 +02:00
Kevin Granger 67dc7aac04 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/filters.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	classes/Category.php
	classes/controller/AdminController.php
	controllers/admin/AdminAttributesGroupsController.php
	controllers/admin/AdminFeaturesController.php
	controllers/admin/AdminImportController.php
	controllers/admin/AdminLogsController.php
	install-dev/install_version.php
	install-dev/langs/ru/data/tab.xml
	js/admin_carrier_wizard.js
	modules/loyalty/loyalty.php
 2013-10-14 12:21:29 +02:00
Fabio Chelly 9e3b82e8ed [*] BO Module productcomments: JS variables are correctly escaped. Padding in error message has also been pushed to theme tpl 2013-10-11 16:37:26 +02:00
gRoussac c2bcc5baa1 [*] FO : TM home modules preparation 2013-10-04 18:32:31 +02:00
Fabio Chelly 6d8cc454e1 [-] MO productcomments: prevents guests to add comments when guest comment is disabled in backoffice 
(cherry picked from commit 345d4cd)
 2013-09-27 11:30:42 +02:00
Fabio Chelly 345d4cdbcf [-] MO productcomments: prevents guests to add comments when guest comment is disabled in backoffice 2013-09-27 11:27:58 +02:00
gRoussac 1d6593612f [-] FO : Fix #PSCFV-10480 again css fix 2013-09-24 12:21:10 +02:00
gRoussac b3a425c73a [-] MO : Blockcart, wrong tbody 2013-09-23 18:20:35 +02:00
gRoussac 92382e347c [-] FO : Fix bug #PSCFV-10478 could not see auto added cart rule voucher on product page 2013-09-23 16:08:44 +02:00
Fabio Chelly 31697fde3c [-] MO productcomments: confirmation message takes moderation mode into account 2013-09-23 11:24:14 +02:00
Fabio Chelly 9377775eca [-] MO productcomments : 
- Module was broken and works now
- A message is displayed to indicate when a comment has been added.
- Error li are correctly indented

#PNM-753
#PNM-1601
#PNM-1660
#PNM-1609
#PNM-1491
#PNM-1311
#PNM-1233
#PNM-1232
#PNM-937
#PNM-775
 2013-09-06 17:54:12 +02:00
Vincent Augagneur ad428dfb2b //MERGE branche release 2013-08-26 10:59:36 +02:00
Krystian Podemski dab86dffe1 * [MO] : blocknewsletter improvements 2013-08-13 16:45:40 +02:00
Damien Metzger f9fdcb1103 [-] FO : fixed html tags that should not appear in blockcategories 2013-08-13 16:22:38 +02:00
Jerome Nadaud 8be3344e41 // W3C validation error 2013-08-09 18:49:47 +02:00
Jerome Nadaud a38fe5ddd3 // W3C validation error 2013-08-09 14:10:38 +02:00
Jerome Nadaud 8e72d122e6 [-] MO : blockcategories FixBug html tags in categories link title 2013-08-08 11:16:45 +02:00
gRoussac 7089ce10ef // remove warnings in blockwishlist 2013-08-06 19:05:08 +02:00
gRoussac fe0afeadc9 [-] MO : mod='blockmyaccount' missing in blockmyaccountfooter.tpl (translation doesnt work), thanks @mypresta-eu 2013-08-06 11:45:29 +02:00
Damien Metzger 75cddbae99 // Protected smarty variable in JS 2013-06-27 16:41:57 +02:00
Vincent Augagneur faa975750d [-] MO : fixed bug #PSCFV-8910 - Productcomments module allows post only one comment per product 2013-06-25 10:26:13 +02:00
sLorenzini 2f40c3126b [-] FO: fixed w3c errors 2013-06-07 18:08:29 +02:00
sLorenzini b5748e8a46 [-] FO: solved some W3C errors 2013-06-07 17:49:24 +02:00
sLorenzini 06af6bdfb5 [-] FO: some W3C errors corrected 2013-06-07 16:30:45 +02:00
Damien Metzger 6222974430 // W3C 2013-06-06 15:48:46 +02:00
Damien Metzger ca64179950 // W3C 2013-06-06 15:27:29 +02:00
Rémi Gaillard 532a727cc2 // add hack for blockcart cache and back button 2013-05-20 17:30:04 +02:00
Damien Metzger 49b5d3ab02 [-] FO : fixed truncate and entities in the cart block #PSCFV-8870 2013-04-29 10:52:44 +02:00
vAugagneur ec051deb31 [*] Modules : use jQuery in blocknewsletter to remove @todo comment - thanks @romainberger 2013-04-22 09:48:30 +02:00
gRoussac 22b506dd41 [-] FO : Fix bug #PSCFV-8623 : Cart rule without code is applied automatically 2013-04-15 11:48:27 +02:00
vAugagneur 2b575e0c96 //removed commented code 2013-04-11 16:31:43 +02:00
Francois Gaillard 77871338c6 // Release branch merged 2013-03-27 10:25:16 +01:00
gRoussac d451097d74 [-] FO : Fix bug #PSCFV-8202 special chars for checkCustomizations js function 2013-03-21 15:09:02 +01:00
sLorenzini de6a53a62f [-] FO: module blockcategories using hard coded styles with no CSS support - #PSCFV-8051 2013-03-06 15:11:15 +01:00
Gregory Roussac 000821f799 //small titles corrections 2013-03-01 00:40:12 +01:00
Gregory Roussac 90e42ccc09 [-] FO : Home w3c validation removed "legend" attribute and target="_blank" 2013-03-01 00:25:19 +01:00
gRoussac 2c2f67dfa8 [-] FO : Fix bug #PSCFI-6686 when url param has no value set 1 to valuePSCFI-6686 2013-02-11 16:13:46 +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
sLorenzini 7013babeda [-] FO: fixed bug rendering Problems in IE6 with default theme - #PSCFV-7628 2013-02-05 15:53:54 +01:00
Francois Gaillard 8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00