dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,578 Commits 9 Branches 19 Tags
3539a779f8d7bbdf8edcdc9cf4dfbbf7a0d1e70a
Commit Graph
2627 Commits
Author SHA1 Message Date
Kevin Granger 5620992735 // fix dashboard 2013-10-10 16:52:41 +02:00
Kevin Granger 7d717ea207 // fix css + kpi + dashboard 2013-10-10 16:29:40 +02:00
Damien Metzger 9fcb039068 // A few CSS fixes 2013-10-09 14:57:15 +02:00
Vincent Augagneur ced6554133 //loyalty module now use bootstrap design 2013-10-09 11:19:32 +02:00
Rémi Gaillard 3b677092bf [*] FO: You can now choose the anchor separator for attributes 2013-10-09 11:01:18 +02:00
gRoussac 008c6ce759 [-] FO : Fix bug #PSCFV-10497 cart_block hooked on column disappearing 2013-10-08 18:37:50 +02:00
Damien Metzger 53748c3119 // Code cleaning 2013-10-08 15:01:46 +02:00
Damien Metzger c75cb99b51 // Code cleaning 2013-10-08 14:45:22 +02:00
Gregory Roussac 4daaa206d2 Merge pull request #818 from cedricfontaine/patch-2 
[-] MO : Price should apply tax as in configuration.
 2013-10-07 09:55:35 -07:00
Gregory Roussac 644e38c05f Merge pull request #817 from cedricfontaine/patch-1 
[-] MO :Loyalty voucher should be without taxes, otherwise points would be negative.
 2013-10-07 09:54:22 -07:00
Francois Gaillard 77b2b4b6ca // Manual merge PS 1.5.6.0 2013-10-07 18:22:55 +02:00
cedricfontaine d63288affd Update loyalty.php 
Price should apply tax as in configuration.
 2013-10-07 12:14:13 -04:00
cedricfontaine 717e195f57 Update LoyaltyModule.php 
Voucher should be without taxes, otherwise points would be negative.
 2013-10-07 12:07:03 -04:00
Vincent Augagneur 46fef35348 //homefeatured now use bootstrap design 2013-10-07 10:25:10 +02:00
indesign47 d3d0897012 [-] MO : productcomments round average up not down 
200 comments with 5 stars and only 1 with 4 stars give only 4 stars
Thanks to manit4c
 2013-10-07 04:02:42 +02:00
indesign47 e0978a0b84 [-] MO : productcomments errors translated in multi-language 2013-10-07 03:18:56 +02:00
gRoussac c2bcc5baa1 [*] FO : TM home modules preparation 2013-10-04 18:32:31 +02:00
Jerome Nadaud 093bf9e065 [-] MO : Blocklayered - Fix expand/collapse tree problem 2013-10-04 11:51:12 +02:00
Jerome NadaudandgRoussac 3d8591c588 [-] MO : Blocklayered - Fix empty fancy box after template edit 2013-10-04 10:14:07 +02:00
Jerome Nadaud 6a0c376a18 [-] MO : Blocklayered - Fix empty fancy box after template edit 2013-10-03 18:58:09 +02:00
Fabio Chelly ea57b3fdd1 [-] MO watermark: original pictures are now protected through htaccess 
#PNM-109
 2013-10-03 15:32:10 +02:00
Vincent Augagneur dec213aecf //now use displayError() in modules 2013-10-02 14:39:41 +02:00
Krystian Podemski 9e4b6c020f [*] FO: We let style selected category in CSS on blockcategories 
It's good to have this by default.
 2013-10-01 12:02:19 +02:00
Vincent Augagneur f4f1b6e831 //vatnumber now use bootstrap design 2013-10-01 11:03:37 +02:00
Vincent Augagneur d6a541df58 //pscleaner now use bootstrap design 2013-09-30 11:23:41 +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
Fabio Chelly 9d94337c9b [-] MO sendtoafriend: The method used to check all required input fields could lead to errors 2013-09-27 16:08:00 +02:00
Fabio Chelly 6d8cc454e1 [-] MO productcomments: prevents guests to add comments when guest comment is disabled in backoffice 
(cherry picked from commit 345d4cd)
 2013-09-27 11:30:42 +02:00
Fabio Chelly 345d4cdbcf [-] MO productcomments: prevents guests to add comments when guest comment is disabled in backoffice 2013-09-27 11:27:58 +02:00
Vincent Augagneur 0cf68ade90 //productscategory now use bootstrap design 2013-09-26 15:09:18 +02:00
Fabio ChellyandgRoussac 7a7a2fb8c3 [-] MO productcomments and loyalty: loyalty doesn't disconnect current user anymore 2013-09-26 14:19:08 +02:00
Gregory Roussac f3e36b896b Merge pull request #746 from Mainmich/patch-1 
[-] MO : Blocklayered Fix pagination incompatibility
 2013-09-26 14:16:51 +02:00
Mainmich a6e67b078e Fix pagination incompatibility 
Javascript function paginateButton does not work with "p" GET parameter in first position, regex only takes &p and not ?p.
 2013-09-25 18:33:58 +02:00
Jerome Nadaud 757fe64217 [-] MO : FixBug #10460 - UTF8 bug on accented URL 2013-09-25 16:09:55 +02:00
Fabio Chelly bdd84771b7 [-] MO productcomments and loyalty: loyalty doesn't disconnect current user anymore 2013-09-25 14:43:30 +02:00
Vincent Augagneur d9803ce086 //newsletter now use bootstrap design 2013-09-24 17:26:28 +02:00
gRoussac 89ac0bc439 [-] FO : Fix #PSCFV-10480 again, css fix 2013-09-24 16:34:18 +02:00
Damien Metzger 799efcba3f [*] BO : Customers KPIs 2013-09-24 15:32:05 +02:00
Vincent Augagneur a913a43b17 //mailalerts now use bootstrap design 2013-09-24 14:49:56 +02:00
gRoussac 1d6593612f [-] FO : Fix #PSCFV-10480 again css fix 2013-09-24 12:21:10 +02:00
gRoussac d37f545058 [-] MO : Fix buig #PSCFV-10480 Blockcart too long cart_block_product_name 2013-09-23 17:26:36 +02:00
gRoussac 92382e347c [-] FO : Fix bug #PSCFV-10478 could not see auto added cart rule voucher on product page 2013-09-23 16:08:44 +02:00
Vincent Augagneur 0b35c5506c //crossselling module now use boostrap design 2013-09-23 15:22:42 +02:00
Vincent Augagneur a2d770e04f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-23 15:10:49 +02:00
Vincent Augagneur 642ff59bef //cheque module now use boostrap design 2013-09-23 15:10:46 +02:00
Damien Metzger 590e738254 // Fixed typo 2013-09-23 14:40:25 +02:00
Fabio Chelly a1555c3fc8 Merge remote-tracking branch 'origin/development' into development 2013-09-23 11:24:26 +02:00
Fabio Chelly 31697fde3c [-] MO productcomments: confirmation message takes moderation mode into account 2013-09-23 11:24:14 +02:00
Jerome Nadaud cf82157d47 // oops 2013-09-23 10:48:56 +02:00
Jerome Nadaud 32a7a28567 [-] MO : FixBug #PNM-1683 - Treeview problem 2013-09-23 10:42:10 +02:00