parent
d8505b2ae0
commit
dd42635442
2 changed files with 9 additions and 8 deletions
|
|
@ -11,6 +11,7 @@
|
|||
* Bring peeping Tom on the 404 page back [#6226](https://github.com/diaspora/diaspora/pull/6226)
|
||||
* Fix mobile photos index page [#6243](https://github.com/diaspora/diaspora/pull/6243)
|
||||
* Fix conversations view with no contacts [#6266](https://github.com/diaspora/diaspora/pull/6266)
|
||||
* Links in the left sidebar are now clickable on full width [#6267](https://github.com/diaspora/diaspora/pull/6267)
|
||||
|
||||
## Features
|
||||
|
||||
|
|
|
|||
|
|
@ -29,16 +29,16 @@
|
|||
= link_to current_user.first_name, local_or_remote_person_path(current_user.person)
|
||||
|
||||
%ul#stream_selection
|
||||
%li.hoverable{:data => {:stream => 'stream'}}
|
||||
= link_to t("streams.multi.title"), stream_path, :rel => 'backbone'
|
||||
%li.hoverable{:data => {:stream => 'activity'}}
|
||||
= link_to t("streams.activity.title"), activity_stream_path, :rel => 'backbone'
|
||||
%li.hoverable{:data => {:stream => 'mentions'}}
|
||||
= link_to t('streams.mentions.title'), mentioned_stream_path, :rel => 'backbone'
|
||||
%li{data: {stream: "stream"}}
|
||||
= link_to t("streams.multi.title"), stream_path, rel: "backbone", class: "hoverable"
|
||||
%li{data: {stream: "activity"}}
|
||||
= link_to t("streams.activity.title"), activity_stream_path, rel: "backbone", class: "hoverable"
|
||||
%li{data: {stream: "mentions"}}
|
||||
= link_to t("streams.mentions.title"), mentioned_stream_path, rel: "backbone", class: "hoverable"
|
||||
%li.all_aspects
|
||||
= render 'aspects/aspect_listings', :stream => @stream
|
||||
= render "aspects/aspect_listings", stream: @stream
|
||||
%li
|
||||
= render 'tags/followed_tags_listings'
|
||||
= render "tags/followed_tags_listings"
|
||||
|
||||
.span6
|
||||
#aspect_stream_container.stream_container
|
||||
|
|
|
|||
Loading…
Reference in a new issue