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

2527 Commits

Author SHA1 Message Date
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
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
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
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
Francois Gaillard 6e0be0c226 Dashboard - Fixed last day trend 2013-09-18 17:28:04 +02:00
Sarah Lorenzini bdb797a66c // update tabs stats 2013-09-17 17:49:49 +02:00
Damien Metzger f7855f2a3a // Always more KPIs 2013-09-17 12:47:13 +02:00
Damien Metzger 70f284ad88 [+] BO : new graph engine nvd3 (still need some development - will replace the other engines) 2013-09-17 10:24:46 +02:00
Sarah Lorenzini 4ef7bd0b77 // update stats tab 2013-09-16 17:51:03 +02:00
Sarah Lorenzini 9dfb573422 // update stats tab 2013-09-16 15:46:21 +02:00
Vincent Augagneur 636c4575f7 //added warning domaine on dashboard && prestashop news improve 2013-09-16 10:59:42 +02:00
Kevin Granger c7ec33f062 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/home/content.tpl
	admin-dev/themes/default/template/controllers/localization/content.tpl
	admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
	admin-dev/themes/default/template/controllers/orders/_new_product.tpl
	admin-dev/themes/default/template/controllers/orders/_product_line.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
	admin-dev/themes/default/template/footer.tpl
	controllers/admin/AdminCarrierWizardController.php
	controllers/admin/AdminCarriersController.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminLocalizationController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminSuppliersController.php
	css/admin.css
	js/admin-products.js
	js/admin_carrier_wizard.js
	translations/fr.gzip
 2013-09-13 11:41:14 +02:00
Damien Metzger d914982961 // Rounded sales on dashboard 2013-09-12 19:26:38 +02:00
Damien Metzger f20a3eb9b5 // Fixed most viewed conversion rate 2013-09-12 18:24:18 +02:00
Damien Metzger 26babfc8f9 // Binded most viewed products on analytics 2013-09-12 18:24:17 +02:00
Damien Metzger 481dc3d307 // Dashboard is almost complete 2013-09-12 18:24:17 +02:00
Damien Metzger 278cd952e2 // Gapi choose between 1.3 and 3.0 versions 2013-09-12 18:24:17 +02:00
gRoussac 3870388e1c Merge branch 'mailalerts_real_multishop' of https://github.com/axome/PrestaShop into axome-mailalerts_real_multishop 
Conflicts:
	modules/mailalerts/mailalerts.php
 2013-09-12 10:09:25 +02:00
Vincent Augagneur 6fa398e8e0 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-12 10:08:32 +02:00