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

2627 Commits

Author SHA1 Message Date
Damien Metzger 04f0545254 // forgot to rename a field 2013-10-22 15:37:33 +02:00
Damien Metzger 1323befe2f // Add link to profitability conf 2013-10-22 15:36:46 +02:00
Damien Metzger 8ef9e71966 // Refine dashboard net profits 2013-10-22 15:16:22 +02:00
Damien Metzger b4499937d8 // Comparison is optionnal 2013-10-22 14:15:10 +02:00
Damien Metzger a4eeff4cd7 // Shortcuts for chart selection 2013-10-22 14:07:19 +02:00
Jerome Nadaud b6d6336e26 // Add date subtitle 2013-10-22 12:12:41 +02:00
Vincent Augagneur a62f9169d5 //missing file btn-primary => btn btn-default 2013-10-22 09:15:46 +02:00
Vincent Augagneur 8144935d76 //btn-primary => btn btn-default thanks @Shipow 2013-10-22 09:12:01 +02:00
Vincent Augagneur 6bc9b54306 //small fix - added new link on block top menu 2013-10-21 22:29:56 +02:00
gRoussac aefa821d7f [*] MO : TM - Blockcart added Layer 2013-10-21 16:55:47 +02:00
Damien Metzger 3cf5c9968b // Added images to blockmanufacturers 2013-10-21 15:39:14 +02:00
Vincent Augagneur 9cf2fe4214 //removed commented code 2013-10-21 10:24:20 +02:00
Vincent Augagneur 459d0232a4 //blockcms use boostrap design 2013-10-21 10:08:45 +02:00
Vincent Augagneur 103582be33 //blocklink now use bootstrap design 2013-10-21 09:58:08 +02:00
Damien Metzger d1a2c33322 Merge pull request #849 from djfm/bootstrap 
// Translations fix
 2013-10-18 09:35:20 -07:00
djfm d097679ea0 // improvements to producttooltip texts 2013-10-18 14:16:17 +00:00
djfm 06b80701c0 // labels 2013-10-18 13:04:49 +00:00
djfm f31eb37f37 // improved translations in carriercompare 2013-10-18 12:53:16 +00:00
djfm 3e687cd533 // improved some messages 2013-10-18 12:17:23 +00:00
Damien Metzger 316f10a352 // Changed calibration of the dashboard chart 2013-10-18 12:15:37 +02:00
Damien Metzger 1cd9ceca35 // Compare data on the chart 2013-10-18 12:10:06 +02:00
Damien Metzger d6235bdacc // Cannot use analytics real time at this time since it is in private beta 2013-10-18 10:54:03 +02:00
Damien Metzger 5a6fef2ee8 // Fixed typo 2013-10-17 17:13:30 +02:00
djfm fc896f6a48 // correct use of translation functions 2013-10-17 13:20:00 +00:00
Damien Metzger fba95afdcc // Removed deprecated modules 2013-10-17 09:37:01 +02:00
Damien Metzger 8cfdad9def // Removed currently unused table in the dashboard 2013-10-16 15:25:53 +02:00
Vincent Augagneur 3e269f211c //blockadvertising now use boostrap design 2013-10-16 14:15:22 +02:00
Vincent Augagneur d67be9431a //blocktopmenu now use bootstrap design 2013-10-16 13:55:58 +02:00
Kevin Granger bc5b807a7b // graph update 2013-10-16 12:18:27 +02:00
Damien Metzger 7c5ff8073f // Code cleaning 2013-10-16 11:47:59 +02:00
gRoussac 8f9fc10221 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-16 11:45:31 +02:00
gRoussac 62aaf16d60 [*] FO : New hooks for home tabs 2013-10-16 11:44:55 +02:00
Damien Metzger a51f41ca09 // Fixed dashboard best sellers 2013-10-16 11:42:42 +02:00
Damien Metzger 7759bfaa66 // Typo 2013-10-15 14:00:37 +02:00
Damien Metzger 7b307094b6 // Added comparison to the dashboard 2013-10-15 13:52:12 +02:00
Damien Metzger 55fad19954 // Updated dashactivity 2013-10-15 11:18:30 +02:00
Vincent Augagneur bd95d03e37 //blockwishlist now use boostrap design 2013-10-15 09:30:26 +02:00
Vincent Augagneur b9c6b0e8af //dateofdelivery now use bootstrap design 2013-10-14 14:55:56 +02:00
Kevin Granger 67dc7aac04 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/filters.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	classes/Category.php
	classes/controller/AdminController.php
	controllers/admin/AdminAttributesGroupsController.php
	controllers/admin/AdminFeaturesController.php
	controllers/admin/AdminImportController.php
	controllers/admin/AdminLogsController.php
	install-dev/install_version.php
	install-dev/langs/ru/data/tab.xml
	js/admin_carrier_wizard.js
	modules/loyalty/loyalty.php
 2013-10-14 12:21:29 +02:00
gRoussac f9cfde9a05 [-] MO : Trackingfront, could not load employee stats date 2013-10-12 23:24:32 +02:00
gRoussac ee29f4365e [-] FO : Copuld not load datepicker in trackingfront stats.php 2013-10-12 17:54:26 +02:00
Mickael Desgranges 1786f8e907 Update blocktopmenu.php 
Fix: block top menu is not updated when content is added in CMS

adding support of AddAfter hook for Cms, Supplier, Manufaturer and Product
 2013-10-11 16:42:21 +02:00
Fabio Chelly 9e3b82e8ed [*] BO Module productcomments: JS variables are correctly escaped. Padding in error message has also been pushed to theme tpl 2013-10-11 16:37:26 +02:00
gRoussac 45e9040606 [-] Bo : Could not update mailarler 2.5 with id_mlang 2013-10-11 15:51:02 +02:00
Vincent Augagneur 5bcacf9b48 //statsdata now use boostrap design 2013-10-11 14:38:18 +02:00
Vincent Augagneur 38a7e90eff //referralprogram now use boostrap design 2013-10-11 14:29:56 +02:00
Fabio Chelly d1a7ff50d5 [*] BO Module watermark: minimum transparency level is 1 and not 0. 2013-10-11 10:51:28 +02:00
fchellypresta 075a911cee Merge pull request #830 from indesign47/patch-5 
[-] MO : productcomments errors translated in multi-language
 2013-10-11 00:40:32 -07:00
fchellypresta 6f878353a6 Merge pull request #831 from indesign47/patch-7 
[-] MO : productcomments round average up not down
 2013-10-11 00:29:37 -07:00
Vincent Augagneur 87417ed928 //producttooltip now use bootstrap design 2013-10-10 18:07:08 +02:00