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

42 Commits

Author SHA1 Message Date
gRoussac
66f3e70d8b // Homefeatured js not used > bootstrap 2013-12-10 17:16:33 +01:00
Damien Metzger
c8ca67eef5 // Fixed upgrade to 1.6.0.1 2013-12-02 15:28:02 +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
Priyank Bolia
0ff7163cba Adding a position order by clause. 
Adding a position order by clause. This way you can manage how the featured products will display on home page. You can manage the order from the PrestaShop backend, and thus you have full control on the display in the frontend.
 2013-11-20 20:56:35 +05:30
Vincent Augagneur
d27fe93daa //modules added ->bootstrap = true; 2013-11-05 18:08:01 +01:00
Vincent Augagneur
8144935d76 //btn-primary => btn btn-default thanks @Shipow 2013-10-22 09:12:01 +02:00
gRoussac
62aaf16d60 [*] FO : New hooks for home tabs 2013-10-16 11:44:55 +02:00
Vincent Augagneur
46fef35348 //homefeatured now use bootstrap design 2013-10-07 10:25:10 +02:00
gRoussac
c2bcc5baa1 [*] FO : TM home modules preparation 2013-10-04 18:32:31 +02:00
PhpMadman
eb6b233e31 [-] BO : If no nb, get default 8, not 10. 2013-07-19 10:33:28 +02:00
Vincent Augagneur
a519f4a7cb //small fix 2013-07-01 16:40:08 +02:00
Damien Metzger
09bbff8737 [*] FO : added smarty cache on blockbestsellers 2013-06-28 17:42:43 +02:00
Damien Metzger
583346bbb7 [*] FO : added smarty cache on homefeatured module 2013-06-28 17:19:06 +02:00
PrestaEdit
a6dafcfa86 [-] MO: homefeatured - numbers are now the same 2013-04-11 12:40:26 +03:00
fram
ed947bc123 // 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
vAugagneur
2e90e12293 //Merge branch release 2013-01-02 09:56:20 +01:00
sLorenzini
8bca84f0bf [-] FO : fixed bug Load homefeatured css file in head. - #PSCFV-6316 2012-12-27 10:51:43 +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
dMetzger
82cf39aa1a // Fixed homefeatured hook after update 2012-09-28 08:20:58 +00: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
rGaillard
ad6d537c98 // Small fix 2012-08-30 15:19:45 +00:00
rGaillard
0e5abe83c4 [-] MO: Use the user language instead of the default in homefeatured 2012-08-30 15:18:40 +00:00
mDeflotte
91b9f4e016 // Homefeatured: Use the new hook name 2012-03-27 09:46:23 +00:00
rMalie
14e6929565 // Welcome 2012² 2012-02-23 16:33:10 +00:00
mMarinetti
1c288bf01d // Welcome 2012 2012-02-22 09:28:22 +00:00
rMalie
024993323a [-] MO: Fix displayHeader hook in homeFeatured 2011-12-22 10:28:56 +00:00
rMalie
68d80262d5 // Remove Module->templateAssign() from modules (use $this->smarty->assign() instead) 2011-12-05 14:04:35 +00:00
mMarinetti
bcdf440523 // fix homefeatured 2011-12-02 16:42:26 +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
91083e190c // Merge -> revision 8800 2011-09-27 14:30:06 +00:00
rMalie
dc957d3d3a // Rename Module->smartyAssign to Module->templateAssign 
[+] Front: Add module controller + url dispatch for modules
 2011-09-23 13:50:33 +00:00
rMalie
668a8d333c [+] MO: Add Module->smartyAssign method, in order to assign variables with module name as prefix in module's templates 2011-09-22 12:05:49 +00:00
rMalie
a9a1706085 // Fix homefeatured products for multishop 2011-08-17 09:41:28 +00:00
rMalie
d0dbb5c185 // Merge -> revision 8014 2011-08-11 12:00:05 +00:00
tDidierjean
a264942b1a // removing cookie from product customization 2011-07-21 14:38:04 +00:00
rMalie
e16a8ab8d3 // Context part 10 2011-07-18 15:27:32 +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