nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:diaspora/diaspora

Browse source
This commit is contained in:
Raphael 2010-11-04 16:45:03 -07:00
commit 20508ad37a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/comments/_comment.html.haml
View file

@ -7,6 +7,6 @@
.content
.from
= link_to post.person.real_name, post.person
= post.text
= markdownify(post.text)
%div.time
= "#{time_ago_in_words(post.updated_at)} #{t('ago')}"

2
public/javascripts/view.js
View file

@ -123,7 +123,7 @@ $(".make_profile_photo").live("click", function(){
$controls = $this.closest(".controls"),
user_id = $controls.attr('data-actor');
person_id = $controls.attr('data-actor_person');
photo_url = $controls(".controls").attr('data-image_url');
photo_url = $controls.attr('data-image_url');
$.ajax({
type: "PUT",