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

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Dennis Schubert 2015-06-01 04:55:32 +02:00
commit 70da822d69
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -52,6 +52,7 @@ Ruby 2.0 is no longer officially supported.
* Cleanup and reorganize image assets [#6004](https://github.com/diaspora/diaspora/pull/6004) * Cleanup and reorganize image assets [#6004](https://github.com/diaspora/diaspora/pull/6004)
* Replace vendored assets for facebox by gem [#6005](https://github.com/diaspora/diaspora/pull/6005) * Replace vendored assets for facebox by gem [#6005](https://github.com/diaspora/diaspora/pull/6005)
* Improve styling of horizontal ruler in posts [#6016](https://github.com/diaspora/diaspora/pull/6016) * Improve styling of horizontal ruler in posts [#6016](https://github.com/diaspora/diaspora/pull/6016)
* Increase post titles length to 50 and use configured pod name as title in the atom feed [#6020](https://github.com/diaspora/diaspora/pull/6020)
## Bug fixes ## Bug fixes
* Disable auto follow back on aspect deletion [#5846](https://github.com/diaspora/diaspora/pull/5846) * Disable auto follow back on aspect deletion [#5846](https://github.com/diaspora/diaspora/pull/5846)

4
app/views/users/public.atom.builder
View file

@ -10,7 +10,7 @@ atom_feed({'xmlns:thr' => 'http://purl.org/syndication/thread/1.0',
feed.tag! :generator, 'Diaspora', :uri => "#{AppConfig.pod_uri.to_s}" feed.tag! :generator, 'Diaspora', :uri => "#{AppConfig.pod_uri.to_s}"
feed.title "#{@user.name}'s Public Feed" feed.title "#{@user.name}'s Public Feed"
feed.subtitle "Updates from #{@user.name} on diaspora*" feed.subtitle "Updates from #{@user.name} on #{AppConfig.settings.pod_name}"
feed.logo "#{@user.image_url(:thumb_small)}" feed.logo "#{@user.image_url(:thumb_small)}"
feed.updated @posts[0].created_at if @posts.length > 0 feed.updated @posts[0].created_at if @posts.length > 0
feed.tag! :link, :rel => 'avatar', :type => 'image/jpeg', 'media:width' => '100', feed.tag! :link, :rel => 'avatar', :type => 'image/jpeg', 'media:width' => '100',
@ -30,7 +30,7 @@ atom_feed({'xmlns:thr' => 'http://purl.org/syndication/thread/1.0',
feed.entry post, :url => "#{@user.url}p/#{post.id}", feed.entry post, :url => "#{@user.url}p/#{post.id}",
:id => "#{@user.url}p/#{post.id}" do |entry| :id => "#{@user.url}p/#{post.id}" do |entry|
entry.title post.message.title entry.title post.message.title(length: 50)
entry.content post.message.markdownified(disable_hovercards: true), :type => 'html' entry.content post.message.markdownified(disable_hovercards: true), :type => 'html'
entry.tag! 'activity:verb', 'http://activitystrea.ms/schema/1.0/post' entry.tag! 'activity:verb', 'http://activitystrea.ms/schema/1.0/post'
entry.tag! 'activity:object-type', 'http://activitystrea.ms/schema/1.0/note' entry.tag! 'activity:object-type', 'http://activitystrea.ms/schema/1.0/note'