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

87 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
Damien Metzger
c095d8f1ca [-] Core : fixed smarty escape htmlall > html 2013-11-22 09:47:15 +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
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
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
Damien Metzger
ad2702e609 // Config files were translated in french 2013-08-20 17:49:05 +02:00
PhpMadman
eb6b233e31 [-] BO : If no nb, get default 8, not 10. 2013-07-19 10:33:28 +02: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
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
Damien Metzger
6222974430 // W3C 2013-06-06 15:48:46 +02:00
Damien Metzger
ca64179950 // W3C 2013-06-06 15:27:29 +02:00
PrestaEdit
59570a58ac [-] MO: homefeatured - numbers are now the same 2013-04-11 12:40:26 +03: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
sLorenzini
f11faead01 [-] FO: added a new line for better display on IE9 for the "new" on homefeatured and product list 2013-01-24 10:11:41 +01:00
sLorenzini
d886bf3103 [-] FO: fixed bug css in IE 2013-01-23 15:31:01 +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
sLorenzini
49eb256575 [-] FO : fixed bug Load homefeatured css file in head. - #PSCFV-6316 2012-12-27 10:51:43 +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
bfff958b1f Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +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
7897d40e22 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-05 11:03:16 +01:00
sLorenzini
59e793fa99 //[-] FO: fixed bug #product_list li span.new: IE 6,7,8 bug: New product badge still not correct position - #PSCFV-5921 2012-12-05 10:42:26 +01:00
Sarah Lorenzini
2b10fcd712 // change h4, h5 2012-12-04 17:15:49 +01:00
Sarah Lorenzini
813d28bda9 [-] FO: fix #product_list li span.new: IE 6,7,8 bug: New product badge not correct position - #PSCFV-5898 2012-11-28 16:07:36 +01:00
vAugagneur
1bd44e79a9 //fix from sarah 2012-11-22 16:48:21 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
sLorenzini
f5cb8185c8 [-] FO : fixed bug #PSCFV-4495 2012-10-02 11:17:20 +00:00
dMetzger
8df3d290d3 // Fixed homefeatured hook after update 2012-09-28 08:20:58 +00:00
lLefevre
f6d41dea32 [-] BO : #PSCFV-4392 : index.php in modules folder and sub folders 2012-09-26 07:11:37 +00:00
sLorenzini
342fd84182 [-] FO : fixed bug #PSCFV-4310 2012-09-24 13:01:32 +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
4c75f80236 [*] TR : add Deutsch translations 2012-09-13 08:32:36 +00:00
rGaillard
bef4268626 // Small fix 2012-08-30 15:19:45 +00:00
rGaillard
856d2fa518 [-] MO: Use the user language instead of the default in homefeatured 2012-08-30 15:18:40 +00:00
dMetzger
2afc71d7cc [-] FO : fixed height of homefeatured products (missing height caused problem on floating div position sometimes) #PSCFV-3638 2012-08-16 11:36:47 +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