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

73 Commits

Author SHA1 Message Date
Vincent Augagneur
d27fe93daa //modules added ->bootstrap = true; 2013-11-05 18:08:01 +01:00
Damien Metzger
2e80ed8de5 // Cleaned conflict 2013-11-04 14:58:17 +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
Damien Metzger
3c1cdf4ef2 // Fixed new arrivals issue 2013-10-31 16:09:10 +01:00
gRoussac
1e094f4016 [-] FO: Fix bug #PSCFV-10623 blocknewproducts shows products when PS_NB_DAYS_NEW_PRODUCT == 0 2013-10-24 23:29:23 +02:00
Damien Metzger
e17dd1fdde // theme installation 2013-10-24 09:49:46 +02:00
Vincent Augagneur
8144935d76 //btn-primary => btn btn-default thanks @Shipow 2013-10-22 09:12:01 +02: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
8ed77030aa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	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/list.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.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/products/suppliers.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminGroupsController.php
	controllers/admin/AdminManufacturersController.php
 2013-09-30 11:01:23 +02:00
Vincent Augagneur
b7045b998a //blocknewproducts now use boostrap design 2013-09-20 16:41:31 +02:00
Julien
08373c0541 [+] Modules : add hookHome 2013-09-14 14:57:00 +02:00
dlage
5f1e08e7e2 Fix variable context 
Avoid attribution to the variable $newProducts inside the if. It caused the code to potentially misbehave throwing errors of:
"variable $newProducts not defined".
 2013-09-01 22:47:41 +01:00
Vincent Augagneur
0ff23eee9f //miss to delete some files 2013-07-02 08:02:05 +02:00
Vincent Augagneur
a519f4a7cb //small fix 2013-07-01 16:40:08 +02:00
Damien Metzger
3d85e81c3d // Oops, removing a block is a sure way to optimize... 2013-06-28 18:52:08 +02:00
Damien Metzger
8acf308639 [*] FO : added smarty cache on blocknewproducts 2013-06-28 15:17:53 +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
f3dfbda02a [-] Core: delete lang files 2013-03-21 14:15:55 +01:00
fram
77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
a4eb2cc7a9 //Merge branch release 2013-01-02 09:56:20 +01:00
Rémi Gaillard
2688e97145 [-] FO: Fix retrocompatibility for modules and old themes 2012-12-31 12:06:28 +01:00
vAugagneur
321eaa191b //added translation 2012-12-28 09:27:12 +01:00
vAugagneur
ef0eb49ba9 [-] CORE : fixed bug #PSCFV-4754 Image sizes are the same for all shops and themes 2012-12-18 14:59:34 +01:00
vAugagneur
4fa7eb6a3d //revert all config.xml 2012-12-06 11:41:52 +01:00
sLorenzini
2a4b7cae75 [-] FO: improvement on h4/h5 edits (id become class) 2012-12-06 10:06:56 +01:00
Sarah Lorenzini
2b10fcd712 // change h4, h5 2012-12-04 17:15:49 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
lLefevre
f6d41dea32 [-] BO : #PSCFV-4392 : index.php in modules folder and sub folders 2012-09-26 07:11:37 +00:00
sLorenzini
4896b787f3 // Renamed images types for the default theme (in order to avoid conflicts) #PSCFV-4242 2012-09-21 14:59:51 +00:00
lLefevre
48b42fb398 [*] TR : update English translations key for Modules 2012-07-12 10:08:13 +00:00
lLefevre
e5b4353871 [*] TR : Update English translation : step 1 2012-07-09 09:43:17 +00:00
lLefevre
1a9e8e99e5 [*] BO : Update Italian translations 2012-07-04 07:37:06 +00:00
lLefevre
c2301680cd [*] BO : Update Italian translations 2012-07-03 16:14:41 +00:00
lLefevre
8d6c373da6 [*] BO : Update Deutsch translations 2012-07-03 16:05:43 +00:00
lLefevre
a01a31cd93 // Add deutshch translations 2012-06-18 13:54:38 +00:00
lLefevre
7121955c4d // Add spanish translations 2012-05-23 15:57:25 +00:00
lLefevre
f0bfc8b3d1 // Add Deutsch (German) translations 2012-05-23 11:58:42 +00:00
lLefevre
9925bf30ad [-] FO : #PSCFV-2150 : Translations of back office are connected width sprintf() 2012-05-14 14:38:07 +00:00
vChabot
67c108ddd3 // delete confirm message when updating module configuration 2012-05-09 08:29:07 +00:00
bMancone
cd694d3fae // Fixed #PSFV-743 2012-03-29 08:47:23 +00:00
lLefevre
c21bef2acf // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
fSerny
593a673afb // Regen all modules config file (in english this time ^^') 2012-03-14 09:41:04 +00:00
fSerny
c49329d4df // Regen all modules config file 2012-03-14 09:37:58 +00:00
rMalie
1dc629a949 // Welcome 2012² 2012-02-23 16:33:10 +00:00
rMalie
30d526422c // French translations (by Xavier) 2012-02-15 13:22:27 +00:00
rMalie
beedaff103 // Modules langs files moved to modules/*/translations/ folder 2012-02-01 14:42:15 +00:00
rMalie
a3276ea411 // Normalize 2012-01-27 10:28:56 +00:00