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

37 Commits

Author SHA1 Message Date
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
Damien Metzger
4fe4d71361 // Stats cleaning 2013-10-29 15:29:55 +01:00
Jerome Nadaud
6f57093f50 [-] BO : FixBug #PSCFV-10600 - Unmatched Boundary with mod_security 2013-10-24 18:36:36 +02:00
Sarah Lorenzini
bdb797a66c // update tabs stats 2013-09-17 17:49:49 +02:00
fram
ed947bc123 // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
fram
77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
François Gaillard
064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
rMalie
49869aaaaf // MERGE product_multistore branch : product fields are now editable per shop 2012-04-17 13:32:12 +00:00
rMalie
009e190263 // MERGE product_multistore branch : product fields are now editable per shop 2012-04-17 13:32:12 +00:00
rMalie
9c6b80fabe // Replace shop->addSqlAssociation() by static call 2012-02-27 13:07:51 +00:00
rMalie
ab2515b67c // Replace shop->addSqlAssociation() by static call 2012-02-27 13:07:51 +00:00
rMalie
8f0257fc87 // Replace shop->addSqlRestriction() and shop->addSqlRestrictionOnLang() by static versions 2012-02-27 12:15:30 +00:00
rMalie
0a3fa7ba14 // Replace shop->addSqlRestriction() and shop->addSqlRestrictionOnLang() by static versions 2012-02-27 12:15:30 +00:00
rMalie
14e6929565 // Welcome 2012² 2012-02-23 16:33:10 +00:00
rMalie
1dc629a949 // Welcome 2012² 2012-02-23 16:33:10 +00:00
dSevere
6d4a5ea9de // Update Stats interface relative to stock available functionnality + retrocompatibility for supplier reference and wholesale_price for a product/product attribute 2011-12-06 14:02:50 +00:00
dSevere
7d88ddef77 // Update Stats interface relative to stock available functionnality + retrocompatibility for supplier reference and wholesale_price for a product/product attribute 2011-12-06 14:02:50 +00:00
vKham
d3cb359a8d // add images css sprites for icon page stats 2011-12-05 14:34:44 +00:00
vKham
862af2eec0 // add images css sprites for icon page stats 2011-12-05 14:34:44 +00:00
vKham
f80a746991 // add title h2 all tab page product, stylesheets stats 2011-12-01 17:39:44 +00:00
vKham
d2d97cd5c6 // add title h2 all tab page product, stylesheets stats 2011-12-01 17:39:44 +00:00
lLefevre
a04d33d156 [*] BO #PSFV-94 : Added AdminStatsController && AdminStatsTabController && norm of statistic modules 2011-11-09 15:48:15 +00:00
rMalie
e6f45e54a6 // Replace shop->sqlAsso(), shop->sqlLang() and shop->sqlRestriction() with shop->addSqlAssociation(), shop->addSqlRestrictionOnLang() and shop->addSqlRestriction() 2011-10-17 09:46:08 +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
rMalie
fb55cfcd11 // Fix all product_lang sql restrictions with multishop 2011-08-19 14:01:23 +00:00
rMalie
d0dbb5c185 // Merge -> revision 8014 2011-08-11 12:00:05 +00:00
tDidierjean
0310674fe0 // Context part 29 2011-08-08 13:17:12 +00:00
rMalie
b59d2200f6 // Fix #PSFV-30 + context part 24 2011-07-28 14:12:17 +00:00
rMalie
3f9a9e41d7 // id_shop on cart product (for links) + change Shop::sqlAsso() + share_order 2011-07-22 08:57:51 +00:00
rMalie
02a738dce1 // Context part 15 2011-07-19 16:17:14 +00:00
rMalie
ff81f71449 // Context in modules + Shop::sql* methods 2011-07-19 09:23:10 +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