dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,910 Commits 9 Branches 19 Tags
7019af3a11fca9c117818dbfe2c4e4b8d663caaa
Commit Graph

2544 Commits

Author SHA1 Message Date
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 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
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
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
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
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
vAugagneur 23ecca163d //blockcontactinfos is now using bootstrap design 2013-09-20 11:46:02 +02:00
vAugagneur 4c5cd50345 /small fix 2013-09-20 11:38:39 +02:00
vAugagneur 2f56a4dbbd //blockcontact is now using bootstrap design 2013-09-20 11:31:12 +02:00
vAugagneur c7ebf5ba5d //blockcart is now using bootstrap design 2013-09-20 11:24:16 +02:00
vAugagneur 07c03ecf6d //blockcategories is now using bootstrap design 2013-09-20 11:18:30 +02:00
Fabio Chelly 4f639329e9 Merge remote-tracking branch 'origin/development' into development 2013-09-20 10:47:17 +02:00
Fabio Chelly 91ae972655 [-] MO mailalert : products alerts can be registered for multiple guests 
#PNM-1669
 2013-09-20 10:46:56 +02:00
Damien Metzger f8ca06d927 // Better cache depth management for smarty 2013-09-20 10:26:58 +02:00
Damien Metzger 33405ed858 // Rollback file wrongly modified by previous commit 2013-09-19 17:57:29 +02:00
Damien Metzger cda7b225e2 // Removed deprecated module 2013-09-19 17:57:29 +02:00
Francois Gaillard 8c6aaa3c7d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-19 17:31:42 +02:00
Francois Gaillard 63f4743134 [-] MO : PNM-1715 - Bug fix accented chars & ajax-cart 2013-09-19 17:31:35 +02:00
Vincent Augagneur 97cff2210f //removed unused code 2013-09-19 17:01:20 +02:00
Vincent Augagneur 53e046c4b5 //removed unused code 2013-09-19 17:00:50 +02:00
Vincent Augagneur 2b2b502ba2 //blockbestsellers && bankwire now use displayError & displayConfirmation 2013-09-19 16:55:04 +02:00
Vincent Augagneur a5642d43a3 //blockbestsellers module configuration is now using bootstrap design 2013-09-19 16:47:51 +02:00
Vincent Augagneur ef063db2f0 //bankwire module configuration is now using bootstrap design 2013-09-19 16:39:22 +02:00
Sarah Lorenzini 5621a3b039 // update tabs stats 2013-09-18 17:47:42 +02:00