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

85 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
Rémi Gaillard
dfd2b8f604 [-] Core: delete lang files 2013-03-21 14:15:55 +01:00
Rémi Gaillard
f3dfbda02a [-] Core: delete lang files 2013-03-21 14:15:55 +01: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
a35469768f //added translation 2012-12-28 09:27:12 +01:00
vAugagneur
321eaa191b //added translation 2012-12-28 09:27:12 +01:00
vAugagneur
768fcf8f84 Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
vAugagneur
bfff958b1f Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
vAugagneur
76b435b639 //revert all config.xml 2012-12-06 11:41:52 +01:00
vAugagneur
4fa7eb6a3d //revert all config.xml 2012-12-06 11:41:52 +01:00
Sarah Lorenzini
31efb947ab // change h4, h5 2012-12-04 17:15:49 +01:00
Sarah Lorenzini
2b10fcd712 // change h4, h5 2012-12-04 17:15:49 +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
lLefevre
55adbb5bbb [-] BO : #PSCFV-4392 : index.php in modules folder and sub folders 2012-09-26 07:11:37 +00:00
lLefevre
f6d41dea32 [-] BO : #PSCFV-4392 : index.php in modules folder and sub folders 2012-09-26 07:11:37 +00:00
lLefevre
d3cd0763cc [*] TR : add Deutsch translations 2012-09-13 08:32:36 +00:00
lLefevre
4c75f80236 [*] TR : add Deutsch translations 2012-09-13 08:32:36 +00:00
lLefevre
46b391114b [*] TR : update English translations key for Modules 2012-07-12 10:08:13 +00:00
lLefevre
48b42fb398 [*] TR : update English translations key for Modules 2012-07-12 10:08:13 +00:00
lLefevre
21d507e976 [*] TR : Update English translation : step 1 2012-07-09 09:43:17 +00:00
lLefevre
e5b4353871 [*] TR : Update English translation : step 1 2012-07-09 09:43:17 +00:00
lLefevre
5d03fbd33b [*] BO : Update Italian translations 2012-07-03 16:14:41 +00:00
lLefevre
c2301680cd [*] BO : Update Italian translations 2012-07-03 16:14:41 +00:00
lLefevre
0d6dd2f8c9 // Add spanish translations 2012-05-23 15:57:25 +00:00
lLefevre
7121955c4d // Add spanish translations 2012-05-23 15:57:25 +00:00
lLefevre
e1dd1ab832 // Add Deutsch (German) translations 2012-05-23 11:58:42 +00:00
lLefevre
f0bfc8b3d1 // Add Deutsch (German) translations 2012-05-23 11:58:42 +00:00
lLefevre
3ddf7259a2 [-] FO : #PSCFV-2150 : Translations of back office are connected width sprintf() 2012-05-14 14:38:07 +00:00
lLefevre
9925bf30ad [-] FO : #PSCFV-2150 : Translations of back office are connected width sprintf() 2012-05-14 14:38:07 +00: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
lLefevre
1998bb56d4 // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
lLefevre
c21bef2acf // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
fSerny
641d3847ef // Regen all modules config file (in english this time ^^') 2012-03-14 09:41:04 +00:00
fSerny
593a673afb // Regen all modules config file (in english this time ^^') 2012-03-14 09:41:04 +00:00
fSerny
4ea89fe96e // Regen all modules config file 2012-03-14 09:37:58 +00:00
fSerny
c49329d4df // Regen all modules config file 2012-03-14 09:37:58 +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