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

1698 Commits

Author SHA1 Message Date
Jerome Nadaud 517e95387c Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-16 15:33:04 +02:00
Jerome Nadaud 3107a4c3f0 // Translations 2013-09-16 15:32:49 +02:00
Kevin Granger 7f6255156e // BO orders 2013-09-16 15:20:30 +02:00
Kevin Granger 7c01df9268 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-16 11:45:13 +02:00
Kevin Granger 70b39019bf // kpi orders 2013-09-16 11:45:02 +02:00
Vincent Augagneur 636c4575f7 //added warning domaine on dashboard && prestashop news improve 2013-09-16 10:59:42 +02:00
Damien Metzger 0e3d53321a [-] BO : limited the number of customers displayed in the group view to 100 in order to avoid memory usage error 2013-09-16 09:56:22 +02:00
Damien Metzger 533003faa0 [-] BO : limited the number of customers displayed in the group view to 100 in order to avoid memory usage error 2013-09-16 09:37:58 +02:00
Jerome Nadaud 74237ff694 // Some fix 2013-09-13 17:11:12 +02:00
Jerome Nadaud 7b532d77fd // Fix some bootstrap design 2013-09-13 15:36:27 +02:00
Kevin Granger 4cde899834 // localization 2013-09-13 12:18:27 +02:00
Jerome Nadaud 2bf17241bd // Fix associated categories tree header 2013-09-13 11:50:27 +02:00
Kevin Granger 968f2a45d5 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-13 11:41:26 +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
Jerome Nadaud f20fa55308 // Fix filter by category checkbox 2013-09-13 09:49:07 +02:00
Jerome Nadaud 3cf4dc76b5 // Fix missing localizations page header toolbar 2013-09-12 18:54:28 +02:00
Damien Metzger 06a178b8fe // Replaced screencast option by menu option 2013-09-12 18:24:18 +02:00
Jerome Nadaud 81b6ec93f9 // Add count down to text input 2013-09-12 17:59:25 +02:00
Jerome Nadaud ba6699a378 // Fix Admin access 2013-09-12 15:55:14 +02:00
Jerome Nadaud c105486fa3 // Tree bugs 2013-09-12 15:22:47 +02:00
Rémi Gaillard f9b1f0ab5e [*] Core: don't re-generate the class_index.php file if a class is not known to avoid misuse of class_exists() 2013-09-12 15:03:23 +02:00
Damien Metzger c2d15f4ade // Changed language display in back office dropdown menu 2013-09-12 14:53:12 +02:00
Jerome Nadaud e63ce0a86d // Tree 2013-09-12 14:47:47 +02:00
Kevin Granger 91d3da310b // dashboard panel version 2013-09-12 14:42:20 +02:00
Vincent Augagneur 4a6c5979a8 //added new useful links on dashboard 2013-09-12 10:52:56 +02:00
Vincent Augagneur 6fa398e8e0 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-12 10:08:32 +02:00
Vincent Augagneur 38822bfb5e //dashactivity configuration 2013-09-12 10:08:28 +02:00
Jerome Nadaud e9dbadcabf // Tree 2013-09-11 20:41:14 +02:00
gRoussac dfdbe39ee3 [-] BO : Small changes when creating vouchers in back office orders 2013-09-11 16:28:11 +02:00
Jerome Nadaud 49c9afec40 // Categories tree 2013-09-11 15:08:24 +02:00
Vincent Augagneur 3cc187a716 //dashactivity trafic source data_list & pie_chart 2013-09-11 10:34:01 +02:00
Jerome Nadaud e0d33eae9e // Categories Tree changes 2013-09-10 18:40:05 +02:00
Vincent Augagneur 1aba28ff6f //typo 2013-09-10 16:42:54 +02:00
Jerome Nadaud 85dc552667 // Toolbar 2013-09-10 14:08:29 +02:00
Kevin Granger 2a7bc49190 // treeview 2013-09-09 19:03:38 +02:00
Vincent Augagneur 4e1a513371 //added rss and useful link on dashboard 2013-09-09 18:44:34 +02:00
Kevin Granger 69b38f4d6f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/products/helpers/tree/tree.tpl
	admin-dev/themes/default/template/controllers/products/helpers/tree/tree_header.tpl
 2013-09-09 18:13:49 +02:00
Kevin Granger 7774e46cb3 // tree view product 2013-09-09 18:12:31 +02:00
Jerome Nadaud c502c9766f [-] BO : FixBug PSCFV-10331 - Tax rules Pagination 2013-09-09 15:04:14 +02:00
Jerome Nadaud accd2d77c1 [+] BO : Adding tree templates and functions 2013-09-09 12:20:58 +02:00
djfm 641cf225f2 // fix small translation bug PSCFV-10329 2013-09-09 09:47:44 +00:00
Jerome Nadaud 36a863df59 [+] BO : Adding Tree Helper 2013-09-06 17:05:19 +02:00
Kevin Granger fa198aeabc // fix menu, design, css 2013-09-06 16:25:01 +02:00
Kevin Granger 1b2bab6943 // performance 2013-09-06 11:03:36 +02:00
Damien Metzger ec11b7e064 // Better control of the requests when our website is down 2013-09-06 10:18:48 +02:00
Vincent Augagneur 4b2ef10dd6 //dashboard data-chart-line added 2013-09-05 19:07:49 +02:00
Vincent Augagneur e352f2137f //small fix 2013-09-05 15:30:59 +02:00
Vincent Augagneur c34dbcf43a //dashboard range date choice in ajax 👍 2013-09-05 15:25:41 +02:00
Sarah Lorenzini f09347a8be // update backup BDD, import, and email pages 2013-09-05 14:55:07 +02:00
Sarah Lorenzini 73524c7a4c // update maintenance and email pages 2013-09-05 14:16:06 +02:00