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

43 Commits

Author SHA1 Message Date
Jerome Nadaud d7de507f42 // Product comments 2013-11-15 11:49:40 +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
Krystian Podemski faa4a18a82 [*] MO: productcomments optimization 2013-10-28 23:21:35 +01:00
Jerome Nadaud 6f57093f50 [-] BO : FixBug #PSCFV-10600 - Unmatched Boundary with mod_security 2013-10-24 18:36:36 +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
indesign47 d3d0897012 [-] MO : productcomments round average up not down 
200 comments with 5 stars and only 1 with 4 stars give only 4 stars
Thanks to manit4c
 2013-10-07 04:02:42 +02:00
Vincent Augagneur dec213aecf //now use displayError() in modules 2013-10-02 14:39:41 +02:00
Fabio Chelly 31697fde3c [-] MO productcomments: confirmation message takes moderation mode into account 2013-09-23 11:24:14 +02:00
François Gaillard 064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur 17350c6149 [-] CORE : fixed bug #PSCFV-4754 Image sizes are the same for all shops and themes 2012-12-18 14:59:34 +01:00
vAugagneur a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
sLorenzini 93aae4afaa // Renamed images types for the default theme (in order to avoid conflicts) #PSCFV-4242 2012-09-21 14:59:51 +00:00
lLefevre 54a1607faf [-] MO : product_comment : fix #PSCFV-3983 2012-09-12 10:03:33 +00:00
lLefevre 46b391114b [*] TR : update English translations key for Modules 2012-07-12 10:08:13 +00:00
vChabot ed9b10e221 [-] MO : BugFix : #PSCFV-2822 : ProductComment module : submitNewMessage url problem 2012-06-25 09:52:35 +00:00
lLefevre 975d59ddc8 [-] MO : productcomments : fix #PSCFV-2890 2012-06-20 13:47:30 +00:00
dMetzger 7fe62ae7d7 // Code cleaning 2012-06-05 11:51:46 +00:00
aFolletete 155f2cbeee [-] MO : Add ModuleController in ProductComments 
// refacto ProductComments
 2012-05-18 10:09:02 +00:00
vChabot 1397fffa4b // delete confirm message when updating module configuration 2012-05-09 08:29:07 +00:00
rMalie 14e6929565 // Welcome 2012² 2012-02-23 16:33:10 +00:00
sThiebaut 49c8f76587 // fixed bug on module 2011-12-30 10:59:50 +00:00
sThiebaut 0d87620905 // maj 2011-12-05 17:22:04 +00:00
mMarinetti 6195381a14 // fix new theme / old php in modules 2011-12-02 16:41:22 +00:00
mMarinetti 7320307212 [+] Project : default theme added 2011-12-02 15:24:40 +00:00
rMalie 9510337b1d // Remove bad _SQL_USE_SLAVE_ uses + normalize Db->executeS(), Db->execute() and Db->numRows() names 2011-10-10 12:18:56 +00:00
bMancone 6edfb9879c // productcomments 2011-09-28 09:02:51 +00:00
bMancone 8664797e44 // productcomments 2011-09-28 08:50:40 +00:00
rMalie 2180359342 // Merge -> revision 8720 2011-09-22 15:45:10 +00:00
bMancone b973c3ef12 [-] MO : Fixed productsComparison 2011-09-01 08:53:47 +00:00
bMancone 081b8e7aa5 [*] MO : productComments - It's now possible to delete comments, beside moderation 2011-08-29 16:21:57 +00:00
bMancone e7720457c1 [-] MO : productComments fixed 2011-08-29 09:19:43 +00:00
lCherifi bf9a25fd59 integration new theme standard 2011-08-23 14:25:09 +00:00
tDidierjean 3d733ae6e2 // Context part 31 2011-08-17 10:07:12 +00:00
gBrunier c83977874c //Changing version 2011-08-12 14:47:18 +00:00
gBrunier abbcf84e6d [*] MO : Review of the productcomments module - Part3 2011-08-11 12:07:25 +00:00
rMalie d0dbb5c185 // Merge -> revision 8014 2011-08-11 12:00:05 +00:00
gBrunier 4f1e8fc2d5 [*] MO : Review of the productcomments module - Part2 2011-08-11 09:48:49 +00:00
gBrunier 9570d3d44f [*] MO : Review of the productcomments module - Part1 2011-08-05 15:09:46 +00:00
rMalie 1816946216 // Fix on module product comment for context 2011-08-05 14:21:16 +00:00
tDidierjean 9213581a03 // Context part 27 2011-07-29 14:29:57 +00:00
rGaillard 8fc7f11014 2011-07-06 10:54:11 +00:00
rGaillard d1a13007b9 2011-07-06 10:10:43 +00:00
aFolletete 05a58f53e6 // 1.5 branche creation 2011-04-12 18:24:40 +00:00