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

1983 Commits

Author SHA1 Message Date
Jerome Nadaud 9b308ae7fc // Fix Translatable field on cart rule information 2013-09-19 19:01:43 +02:00
Jerome Nadaud b40b9ec328 // Fix Permissions 2013-09-19 18:26:42 +02:00
Jerome Nadaud 2e80f00ba2 // Remove console log 2013-09-19 17:39:11 +02:00
Jerome Nadaud 48d7e43f1c Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-19 17:38:19 +02:00
Jerome Nadaud 6f483a87a9 // Fix hide language on ajax load 2013-09-19 17:38:07 +02:00
Sarah Lorenzini 550f6c190b // update stats tabs 2013-09-19 17:36:27 +02:00
gRoussac e0b59082f9 [-] BO : Issue with domready on adminImport 2013-09-19 17:19:51 +02:00
Kevin Granger 650001024a // orders cleanup 2013-09-19 16:55:06 +02:00
gRoussac ea6ea955bb // licence 2013-09-19 16:39:21 +02:00
gRoussac 0c511dead5 [*] FIX #PSCFV-8106 do not regenerate thumbnails if not 2013-09-19 16:28:19 +02:00
Jerome Nadaud 3b465111b9 // Customer group 2013-09-19 15:57:28 +02:00
Jerome Nadaud 15622fbf45 // Customers group 2013-09-19 14:25:17 +02:00
Kevin Granger be8f728b2a // orders 2013-09-19 12:09:25 +02:00
djfm 0a9f425281 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-18 16:08:44 +00: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
gRoussac f293562ea4 [-] BO : Fix bug #PSCFV-8214 import entity pre selected 2013-09-18 15:03:16 +02:00
Kevin Granger b71b594ca1 // fix tree search / title / manufacturers 2013-09-18 15:00:10 +02:00
Jerome Nadaud 5a206e83a8 // Security 2013-09-18 10:43:58 +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
Jerome Nadaud 0971750f9f // Attribute generator to bootstrap 2013-09-17 16:36:54 +02:00
Rémi Gaillard 47c5f400ee // Add gender on order view 2013-09-17 16:30:47 +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
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
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 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