Unverified Commit 01ae0045 authored by Steffen van Bergerem's avatar Steffen van Bergerem Committed by Benjamin Neff
Browse files

Make public stream accessible for logged out users 

Fixes #6564.

closes #7775
parent 7d6623d0

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
* Show error message when creating posts with invalid aspects [#7742](https://github.com/diaspora/diaspora/pull/7742)



## Features

* Make public stream accessible for logged out users [#7775](https://github.com/diaspora/diaspora/pull/7775)



# 0.7.4.1

app/assets/javascripts/app/views/stream_view.js

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ app.views.Stream = app.views.InfScroll.extend({ 


  markNavSelected : function() {

    var activeStream = Backbone.history.fragment;

    var streamSelection = $("#stream_selection");

    var streamSelection = $("#stream-selection");

    streamSelection.find("[data-stream]").removeClass("selected");

    streamSelection.find("[data-stream='" + activeStream + "']").addClass("selected");

app/assets/stylesheets/stream.scss

+4 −0
Original line number Diff line number Diff line
@@ -4,6 +4,10 @@ 
  }

}



.public-stream {

  float: none;

}



.main-stream-publisher {

  margin-top: 20px;

  padding: 0;

app/controllers/streams_controller.rb

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#   the COPYRIGHT file.



class StreamsController < ApplicationController

  before_action :authenticate_user!

  before_action :authenticate_user!, except: :public

  before_action :save_selected_aspects, :only => :aspects



  layout proc { request.format == :mobile ? "application" : "with_header" }

app/helpers/application_helper.rb

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,10 @@ module ApplicationHelper 
    current_user.services.size == AppConfig.configured_services.size

  end



  def service_unconnected?(service)

    AppConfig.show_service?(service, current_user) && current_user.services.none? {|x| x.provider == service }

  end



  def popover_with_close_html(without_close_html)

    without_close_html + link_to('&times;'.html_safe, "#", :class => 'close')

  end