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

5042 Commits

Author SHA1 Message Date
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
Damien Metzger 39fdc8c926 [+] BO : Added new class ConfigurationKPI for KPI cache storage 2013-09-18 15:09:04 +02:00
Kevin Granger b71b594ca1 // fix tree search / title / manufacturers 2013-09-18 15:00:10 +02:00
Damien Metzger 8a4b24f45e // Added KPIs in products and categories 2013-09-18 13:49:42 +02:00
Damien Metzger 50a9e7ef99 // Code cleaning 2013-09-18 10:29:19 +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
Damien Metzger c0c4af988f // Added net profits / visitor as a KPI 2013-09-17 10:47:54 +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 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 235af94a92 // Fix Page header toolbar 2013-09-16 17:05:27 +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 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 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 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 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
gRoussac db4b69d10c [-] BO : Customer message twice encoded 2013-09-12 18:03:30 +02:00
Jerome Nadaud 039955e6a1 // Fix bug customer list in multistore 2013-09-12 16: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
gRoussac 5095b45e47 [-] BO : Fix bug, orders states not ordered by order state name 2013-09-12 15:09:21 +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
Jerome Nadaud e63ce0a86d // Tree 2013-09-12 14:47:47 +02:00
Francois Gaillard 53c1e56c51 [-] BO : Bug fix - Encoding & tips of the day 2013-09-12 14:32:02 +02:00
gRoussac 90091d4f2c [-] BO : Do not copy link_rewrite from title if cms already has one 2013-09-12 10:50:04 +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
Rémi Gaillard c42d71b8f5 // oups 2013-09-11 16:06:23 +02:00