dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,215 Commits 9 Branches 19 Tags
ece4331622f6f43a0d86344bb85bdf3a94271ff0
Commit Graph
2762 Commits
Author SHA1 Message Date
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
Vincent Augagneur 12f67a825b //carriercompare now use bootstrap design 2013-09-23 10:24:26 +02:00
Vincent Augagneur 39d84759a3 //blockviewed now use boostrap design 2013-09-23 10:06:43 +02:00
Vincent Augagneur 0fa8b4305e //blocktags now use boostrap design 2013-09-23 10:03:28 +02:00
Vincent Augagneur 6e24fe1411 //blocksupplier now use bootstrap design 2013-09-23 09:52:58 +02:00
Vincent Augagneur d71a6a90da //now blockstore use bootstrap design 2013-09-23 09:48:59 +02:00
Damien Metzger dadf83d6f6 [*] BO : removed deprecated chart engines 2013-09-20 18:27:35 +02:00
Damien Metzger ed1574e9ed // Finished nvd3 chart 2013-09-20 18:12:10 +02:00
Vincent Augagneur 504485cef3 //blockspecials now use bootstrap design 2013-09-20 17:51:24 +02:00
Vincent Augagneur 4136697c5e //blocksocial now use boostrap design 2013-09-20 17:22:15 +02:00
Vincent Augagneur e332de1d50 //blockrss now use boostrap design 2013-09-20 17:14:50 +02:00
Vincent Augagneur 24b6d3d387 //blockpaymentlogo now use boostrap design 2013-09-20 17:02:15 +02:00
Vincent Augagneur 4b4622a1c7 //blocknewsletter now use boostrap design 2013-09-20 16:52:48 +02:00
Vincent Augagneur b7045b998a //blocknewproducts now use boostrap design 2013-09-20 16:41:31 +02:00
Vincent Augagneur 2f3d736f13 //blockmanufacturer is now using bootstrap design 2013-09-20 14:56:41 +02:00
vAugagneur aef0897436 //blockcustomerprivacy now use bootstrap design 2013-09-20 13:22:35 +02:00