Merge branch 'master' of github.com:webnotes/erpnext into production

This commit is contained in:
Nabin Hait
2012-12-12 12:58:22 +05:30
15 changed files with 179 additions and 182 deletions

View File

@@ -32,7 +32,7 @@ erpnext.ActivityFeed = Class.extend({
},
scrub_data: function(data) {
data.by = wn.user_info(data.owner).fullname;
data.imgsrc = wn.user_info(data.owner).image;
data.imgsrc = wn.utils.get_file_link(wn.user_info(data.owner).image);
// feedtype
if(!data.feed_type) {