gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

A lot of fixes from a live test

Browse source
This commit is contained in:
Eugen Rochko 2016-02-28 15:46:29 +01:00
parent f1654da7ad
commit 47d50b0e39
17 changed files with 59 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/views/profile/_favourite.html.haml Normal file
View file

@ -0,0 +1,5 @@
.entry.entry-favourite
.content
%strong= favourite.account.acct
favourited a post by
%strong= favourite.status.account.acct

5
app/views/profile/_follow.html.haml Normal file
View file

@ -0,0 +1,5 @@
.entry.entry-follow
.content
%strong= follow.account.acct
is now following
%strong= follow.target_account.acct

2
app/views/profile/_status.html.haml
View file

@ -14,7 +14,7 @@
.header
= render partial: 'status_header', locals: { status: status.reblog? ? status.reblog : status }
.content
= status.content
= status.content.html_safe
.counters
= render partial: 'status_footer', locals: { status: status.reblog? ? status.reblog : status }

4
app/views/xrd/webfinger.xml.ruby
View file

@ -1,8 +1,8 @@
Nokogiri::XML::Builder.new do |xml|
xml.XRD(xmlns: 'http://docs.oasis-open.org/ns/xri/xrd-1.0') do
xml.Subject @canonical_account_uri
xml.Alias profile_url(name: @account.username)
xml.Link(rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: profile_url(name: @account.username))
xml.Alias profile_url(@account)
xml.Link(rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: profile_url(@account))
xml.Link(rel: 'http://schemas.google.com/g/2010#updates-from', type: 'application/atom+xml', href: atom_user_stream_url(id: @account.id))
xml.Link(rel: 'salmon', href: salmon_url(@account))
xml.Link(rel: 'magic-public-key', href: @magic_key)