diff --git a/Changelog.md b/Changelog.md index 5cb06f322..7026b59f3 100644 --- a/Changelog.md +++ b/Changelog.md @@ -99,6 +99,7 @@ by them self. ## Bug fixes +* Fix posting functionality on tags show view [#4017][#4107](https://github.com/diaspora/diaspora/issues/4017)(https://github.com/diaspora/diaspora/pull/4112) * Fix cancel button on getting_started confirmation box [#4073](https://github.com/diaspora/diaspora/issues/4073) * Reset comment box height after posting a comment. [#4030](https://github.com/diaspora/diaspora/issues/4030) * Fade long tag names. [#3899](https://github.com/diaspora/diaspora/issues/3899) diff --git a/app/assets/javascripts/app/views/publisher_view.js b/app/assets/javascripts/app/views/publisher_view.js index 0c00fc2d7..3deb58b86 100644 --- a/app/assets/javascripts/app/views/publisher_view.js +++ b/app/assets/javascripts/app/views/publisher_view.js @@ -6,6 +6,7 @@ //= require ./publisher/services //= require ./publisher/aspects_selector //= require ./publisher/getting_started +//= require jquery.textchange app.views.Publisher = Backbone.View.extend(_.extend( app.views.PublisherServices, diff --git a/app/assets/javascripts/home.js b/app/assets/javascripts/home.js index e53601da1..2d14f6045 100644 --- a/app/assets/javascripts/home.js +++ b/app/assets/javascripts/home.js @@ -3,6 +3,5 @@ * the COPYRIGHT file. */ -//= require jquery.textchange //= require aspect-edit-pane -//= require fileuploader-custom \ No newline at end of file +//= require fileuploader-custom diff --git a/app/assets/javascripts/people.js b/app/assets/javascripts/people.js index 4f0d7958a..d5e32715e 100644 --- a/app/assets/javascripts/people.js +++ b/app/assets/javascripts/people.js @@ -5,4 +5,3 @@ //= require aspect-edit-pane //= require fileuploader-custom //= require jquery.autoSuggest.custom -//= require jquery.textchange \ No newline at end of file diff --git a/app/views/tags/show.haml b/app/views/tags/show.haml index d04b53c5c..ac6132215 100644 --- a/app/views/tags/show.haml +++ b/app/views/tags/show.haml @@ -2,7 +2,6 @@ -# licensed under the Affero General Public License version 3 or later. See -# the COPYRIGHT file. - - content_for :page_title do - if @stream.tag_name = @stream.display_tag_name diff --git a/features/follows_tags.feature b/features/follows_tags.feature index 28ac138df..fedc3fa8a 100644 --- a/features/follows_tags.feature +++ b/features/follows_tags.feature @@ -20,7 +20,7 @@ Feature: posting Scenario: can post a message from the tag page Then I should see "#boss" within "#publisher" - And I post a status with the text "#boss from the tag page" + And I post "#boss from the tag page" And I search for "#boss" Then I should see "#boss from the tag page" @@ -29,6 +29,12 @@ Feature: posting And I follow "#boss" Then I should see "I am da #boss" within "body" + Scenario: see a tag that I am following and I post over there + When I go to the home page + And I follow "#boss" + And I post "#boss from the #boss tag page" + Then I should see "#boss from the #boss tag page" within "body" + Scenario: can stop following a tag from the tag page When I press "Following #boss" And I go to the followed tags stream page