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

3638 Commits

Author SHA1 Message Date
Jerome Nadaud 38d565110f // List header fix 2013-09-18 17:23:22 +02:00
Kevin Granger ac1b9fd96e Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-18 17:10:59 +02:00
Kevin Granger 806e628997 // dashboard update version 2013-09-18 17:10:48 +02:00
Jerome Nadaud 1f3e717eb6 // Preferences - Admin bootstrap fix 2013-09-18 16:22:05 +02:00
Jerome Nadaud 0683ed4092 // Some list design fix 2013-09-18 15:25:58 +02:00
Kevin Granger b71b594ca1 // fix tree search / title / manufacturers 2013-09-18 15:00:10 +02:00
Jerome Nadaud c48f4f5e1b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-18 10:44:19 +02:00
Jerome Nadaud 5a206e83a8 // Security 2013-09-18 10:43:58 +02:00
Damien Metzger 50a9e7ef99 // Code cleaning 2013-09-18 10:29:19 +02:00
Jerome Nadaud 897f1eafeb //Suppliers view 2013-09-18 10:29:04 +02:00
Jerome Nadaud 8081acb0b5 // Supliers view 2013-09-18 10:09:45 +02:00
Jerome Nadaud 8f10a0e32f // Product customization 2013-09-17 17:30:23 +02:00
Kevin Granger 51663f972e // fix scenes 2013-09-17 17:15:40 +02:00
Jerome Nadaud 0971750f9f // Attribute generator to bootstrap 2013-09-17 16:36:54 +02:00
Damien Metzger f7855f2a3a // Always more KPIs 2013-09-17 12:47:13 +02:00
Jérôme Nadaud 47341ce0bb // Attributes generator 2013-09-17 12:33:06 +02:00
Kevin Granger 5c04e5564c // tags + fixed-width 2013-09-17 11:59:57 +02:00
Damien Metzger c0c4af988f // Added net profits / visitor as a KPI 2013-09-17 10:47:54 +02:00
Jérôme Nadaud 455904a59b // Some input fix 2013-09-17 10:13:00 +02:00
Kevin Granger e08d2a8361 // fix 2013-09-17 10:00:33 +02:00
Jérôme Nadaud ab5dd91359 // Localization 2013-09-17 09:18:56 +02:00
Jerome Nadaud 57ed337030 // Fix autosize for products attachment tab textarea 2013-09-16 18:57:11 +02:00
Damien Metzger 8934f9c7ed [*] BO : Connected the first KPIs to real data 2013-09-16 18:40:34 +02:00
Jerome Nadaud 80b6d5a570 // fix autosize for textarea in options.tpl 2013-09-16 18:28:57 +02:00
Jerome Nadaud a4103265e5 // Color picker 2013-09-16 18:17:29 +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 29dad488d4 // Stats list active class 2013-09-16 16:12:23 +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
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 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 b58dddf521 // moved search/reset of list header 2013-09-13 15:03:26 +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
Kevin Granger ce74aeb357 // nav 2013-09-13 09:35:36 +02:00