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

2908 Commits

Author SHA1 Message Date
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
Rémi Gaillard
6ee538c710 // fix on ps_cleaner 2013-10-15 19:53:59 +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
Kevin Granger
5620992735 // fix dashboard 2013-10-10 16:52:41 +02:00
Kevin Granger
7d717ea207 // fix css + kpi + dashboard 2013-10-10 16:29:40 +02:00
Damien Metzger
9fcb039068 // A few CSS fixes 2013-10-09 14:57:15 +02:00
Vincent Augagneur
ced6554133 //loyalty module now use bootstrap design 2013-10-09 11:19:32 +02:00
Rémi Gaillard
3b677092bf [*] FO: You can now choose the anchor separator for attributes 2013-10-09 11:01:18 +02:00
gRoussac
008c6ce759 [-] FO : Fix bug #PSCFV-10497 cart_block hooked on column disappearing 2013-10-08 18:37:50 +02:00
Damien Metzger
53748c3119 // Code cleaning 2013-10-08 15:01:46 +02:00
Damien Metzger
c75cb99b51 // Code cleaning 2013-10-08 14:45:22 +02:00
Gregory Roussac
4daaa206d2 Merge pull request #818 from cedricfontaine/patch-2 
[-] MO : Price should apply tax as in configuration.
 2013-10-07 09:55:35 -07:00
Gregory Roussac
644e38c05f Merge pull request #817 from cedricfontaine/patch-1 
[-] MO :Loyalty voucher should be without taxes, otherwise points would be negative.
 2013-10-07 09:54:22 -07:00
Francois Gaillard
77b2b4b6ca // Manual merge PS 1.5.6.0 2013-10-07 18:22:55 +02:00
cedricfontaine
d63288affd Update loyalty.php 
Price should apply tax as in configuration.
 2013-10-07 12:14:13 -04:00
cedricfontaine
717e195f57 Update LoyaltyModule.php 
Voucher should be without taxes, otherwise points would be negative.
 2013-10-07 12:07:03 -04:00
Vincent Augagneur
46fef35348 //homefeatured now use bootstrap design 2013-10-07 10:25:10 +02:00
indesign47
d3d0897012 [-] MO : productcomments round average up not down 
200 comments with 5 stars and only 1 with 4 stars give only 4 stars
Thanks to manit4c
 2013-10-07 04:02:42 +02:00
indesign47
e0978a0b84 [-] MO : productcomments errors translated in multi-language 2013-10-07 03:18:56 +02:00
gRoussac
c2bcc5baa1 [*] FO : TM home modules preparation 2013-10-04 18:32:31 +02:00
Jerome Nadaud
093bf9e065 [-] MO : Blocklayered - Fix expand/collapse tree problem 2013-10-04 11:51:12 +02:00
PhpMadman
18ab409eeb [*] BO: #PNM-1472 Changed label and transparency range check to 1 
Changed label to 1-100 since, there is no need to set transparency to 0, since it will pretty much will be invisible already at 1
 2013-10-04 10:38:03 +02:00
Jerome Nadaud
3d8591c588 [-] MO : Blocklayered - Fix empty fancy box after template edit 2013-10-04 10:14:07 +02:00