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

18608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sarah Lorenzini 4ef7bd0b77 // update stats tab 2013-09-16 17:51:03 +02:00
Jerome Nadaud 7b06758e22 // Fix carrier header and button link 2013-09-16 17:23:01 +02:00
Vincent Augagneur c7a777163c //small fix 2013-09-16 17:14:08 +02:00
Jerome Nadaud fce87cf66a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-16 17:05:39 +02:00
Jerome Nadaud 235af94a92 // Fix Page header toolbar 2013-09-16 17:05:27 +02:00
Vincent Augagneur b0ace74155 //small fix 2013-09-16 16:30:13 +02:00
Jerome Nadaud 7643a45d81 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-16 16:12:37 +02:00
Jerome Nadaud 29dad488d4 // Stats list active class 2013-09-16 16:12:23 +02:00
Sarah Lorenzini 9dfb573422 // update stats tab 2013-09-16 15:46:21 +02:00
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 f9334b029b // add .row-margin-bottom 2013-09-16 15:05:19 +02:00
Jerome Nadaud 8f7cb72231 // Fix tabstop on language dropdown button 2013-09-16 14:35:28 +02:00
Jerome Nadaud 7e8d119213 // Textarea autosize 2013-09-16 14:25:49 +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
Kevin Granger 2af6c30bde // fix nav 2013-09-16 09:50:34 +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
Kevin Granger 81a783679d // fix nav 2013-09-13 18:35:27 +02:00
Kevin Granger bcfd092a1d // fix nav 2013-09-13 17:48:46 +02:00
Jerome Nadaud be0592d5a2 // Some fix 2013-09-13 17:19:20 +02:00
Jerome Nadaud 74237ff694 // Some fix 2013-09-13 17:11:12 +02:00
Jerome Nadaud 5e2aa392da // Some fix 2013-09-13 15:40:51 +02:00
Jerome Nadaud 7b532d77fd // Fix some bootstrap design 2013-09-13 15:36:27 +02:00
Kevin Granger b58dddf521 // moved search/reset of list header 2013-09-13 15:03:26 +02:00
Kevin Granger 4f3183283f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-13 12:18:43 +02:00
Kevin Granger 4cde899834 // localization 2013-09-13 12:18:27 +02:00
Jerome Nadaud 0ba9704c21 // Fix class index error 2013-09-13 12:17:24 +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
Kevin Granger ce74aeb357 // nav 2013-09-13 09:35:36 +02:00
Damien Metzger d914982961 // Rounded sales on dashboard 2013-09-12 19:26:38 +02:00
Jerome Nadaud 7d9f9a7bfc // Fix CMS missing Page header toolbar 2013-09-12 19:21:53 +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
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
Jerome Nadaud 14a9d914d8 // Fix module uninstall button 2013-09-12 18:23:27 +02:00
gRoussac db4b69d10c [-] BO : Customer message twice encoded 2013-09-12 18:03:30 +02:00
Jerome Nadaud 81b6ec93f9 // Add count down to text input 2013-09-12 17:59:25 +02:00
Jerome Nadaud 039955e6a1 // Fix bug customer list in multistore 2013-09-12 16:59:25 +02:00
Jerome Nadaud 29db737c10 // Add autosize to textarea 2013-09-12 16:52:55 +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