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:
danielvincent 2010-10-05 13:40:10 -07:00
commit 33e478229e
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/views/shared/_aspect_friends.haml
View file

@ -6,11 +6,11 @@
= owner_image_link = owner_image_link
- for friend in @friends - for friend in @friends
= person_image_link(friend) = person_image_link(friend)
- if @logged_in && (@aspect == :public) - if @logged_in && (@aspect == :public)
%h3 Facebook Friends %h3 Facebook Friends
- @fb_friends = MiniFB.get(@access_token, 'me', :type => "friends") - @fb_friends = MiniFB.get(@access_token, 'me', :type => "friends")
- @fb_friends[:data].each do |friend| - @fb_friends[:data].each do |friend|
= image_tag( "http://graph.facebook.com/#{friend[:id]}/picture" ) = image_tag( "http://graph.facebook.com/#{friend[:id]}/picture" )
-unless (@aspect == :all) || (@aspect == :public) -unless (@aspect == :all) || (@aspect == :public)
= link_to (image_tag('add_friend_button.png', :height => "50px", :width => "50px")), "#add_request_pane", :id => 'add_request_button' = link_to (image_tag('add_friend_button.png', :height => "50px", :width => "50px")), "#add_request_pane", :id => 'add_request_button'

2
config/deploy_config.yml
View file

@ -6,7 +6,7 @@ cross_server:
deploy_to: '/usr/local/app/diaspora' deploy_to: '/usr/local/app/diaspora'
user: 'root' user: 'root'
repo: 'git://github.com/diaspora/diaspora.git' repo: 'git://github.com/diaspora/diaspora.git'
branch: 'salmon_refactor' branch: 'master'
default_env: 'development' default_env: 'development'
servers: servers:
tom: tom: