Unverified Commit 241c17a8 authored by Dennis Schubert's avatar Dennis Schubert
Browse files

Merge branch 'release/0.6.2.0'

parents b88f53a3 ea35061f
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -3,3 +3,4 @@
--color
--tag ~performance
--order random
--require spec_helper
+35 −0
Original line number Diff line number Diff line
# 0.6.2.0

## Refactor
* Use string-direction gem for rtl detection [#7181](https://github.com/diaspora/diaspora/pull/7181)
* Reduce i18n.load side effects [#7184](https://github.com/diaspora/diaspora/pull/7184)
* Force jasmine fails on syntax errors [#7185](https://github.com/diaspora/diaspora/pull/7185)
* Don't display mail-related view content if it is disabled in the pod's config [#7190](https://github.com/diaspora/diaspora/pull/7190)
* Use typeahead.js from rails-assets.org [#7192](https://github.com/diaspora/diaspora/pull/7192)
* Refactor ShareVisibilitesController to use PostService [#7196](https://github.com/diaspora/diaspora/pull/7196)
* Unify desktop and mobile head elements [#7194](https://github.com/diaspora/diaspora/pull/7194) [#7209](https://github.com/diaspora/diaspora/pull/7209)
* Refactor flash messages on ajax errors for comments, likes, reshares and aspect memberships [#7202](https://github.com/diaspora/diaspora/pull/7202)
* Only require AWS-module for fog [#7201](https://github.com/diaspora/diaspora/pull/7201)
* Only show community spotlight links on the contacts page if community spotlight is enabled [#7213](https://github.com/diaspora/diaspora/pull/7213)
* Require spec\_helper in .rspec [#7223](https://github.com/diaspora/diaspora/pull/7223)
* Make the CSRF mail a bit more friendly [#7238](https://github.com/diaspora/diaspora/pull/7238) [#7241](https://github.com/diaspora/diaspora/pull/7241)

## Bug fixes
* Fix fetching comments after fetching likes [#7167](https://github.com/diaspora/diaspora/pull/7167)
* Hide 'reshare' button on already reshared posts [#7169](https://github.com/diaspora/diaspora/pull/7169)
* Only reload profile header when changing aspect memberships [#7183](https://github.com/diaspora/diaspora/pull/7183)
* Fix visiblity on invitation modal when opening it from the stream [#7191](https://github.com/diaspora/diaspora/pull/7191)
* Add avatar fallback on tags page [#7198](https://github.com/diaspora/diaspora/pull/7198)
* Update notifications when changing the stream [#7199](https://github.com/diaspora/diaspora/pull/7199)
* Fix 500 on mobile commented and liked streams [#7219](https://github.com/diaspora/diaspora/pull/7219)

## Features
* Show spinner when loading comments in the stream [#7170](https://github.com/diaspora/diaspora/pull/7170)
* Add a dark color theme [#7152](https://github.com/diaspora/diaspora/pull/7152)
* Added setting for custom changelog URL [#7166](https://github.com/diaspora/diaspora/pull/7166)
* Show more information of recipients on conversation creation [#7129](https://github.com/diaspora/diaspora/pull/7129)
* Update notifications every 5 minutes and when opening the notification dropdown [#6952](https://github.com/diaspora/diaspora/pull/6952)
* Show browser notifications when receiving new unread notifications [#6952](https://github.com/diaspora/diaspora/pull/6952)
* Only clear comment textarea when comment submission was successful [#7186](https://github.com/diaspora/diaspora/pull/7186)
* Add support for graceful unicorn restarts [#7217](https://github.com/diaspora/diaspora/pull/7217)

# 0.6.1.0

Note: Although this is a minor release, the configuration file changed because the old Mapbox implementation is no longer valid, and the current implementation requires additional fields. Chances are high that if you're using the old integration, it will be broken anyway. If you do use Mapbox, please check out the `diaspora.yml.example` for new parameters.
+6 −2
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ gem "json-schema", "2.7.0"

gem "devise", "4.2.0"
gem "devise_lastseenable", "0.0.6"
gem "devise-token_authenticatable", "0.5.2"

# Captcha

@@ -73,8 +72,8 @@ gem "activerecord-import", "0.15.0"

# File uploading

gem "fog",         "1.38.0", require: "fog/aws"
gem "carrierwave", "0.11.2"
gem "fog",         "1.38.0"
gem "mini_magick", "4.5.1"

# GUID generation
@@ -105,6 +104,7 @@ source "https://rails-assets.org" do
  gem "rails-assets-markdown-it-sup",                     "1.0.0"
  gem "rails-assets-highlightjs",                         "9.7.0"
  gem "rails-assets-bootstrap-markdown",                  "2.10.0"
  gem "rails-assets-corejs-typeahead",                    "1.0.1"

  # jQuery plugins

@@ -136,6 +136,10 @@ gem "twitter-text", "1.14.0"
gem "ruby-oembed",       "0.10.1"
gem "open_graph_reader", "0.6.1"

# RTL support

gem "string-direction", "1.2.0"

# Security Headers

gem "secure_headers", "3.5.0"
+7 −4
Original line number Diff line number Diff line
@@ -171,8 +171,6 @@ GEM
      railties (>= 4.1.0, < 5.1)
      responders
      warden (~> 1.2.3)
    devise-token_authenticatable (0.5.2)
      devise (>= 4.0.0, < 4.3.0)
    devise_lastseenable (0.0.6)
      devise
      rails (>= 3.0.4)
@@ -648,6 +646,8 @@ GEM
      rails-assets-jquery (>= 1.9.1, < 4)
    rails-assets-bootstrap-markdown (2.10.0)
      rails-assets-bootstrap (~> 3)
    rails-assets-corejs-typeahead (1.0.1)
      rails-assets-jquery (>= 1.7)
    rails-assets-diaspora_jsxc (0.1.5.develop.7)
      rails-assets-emojione (~> 2.0.1)
      rails-assets-favico.js (>= 0.3.10, < 0.4)
@@ -821,6 +821,8 @@ GEM
      activesupport (>= 3.0)
      sprockets (>= 2.8, < 4.0)
    state_machine (1.2.0)
    string-direction (1.2.0)
      yard (~> 0.8)
    swd (1.0.1)
      activesupport (>= 3)
      attr_required (>= 0.0.5)
@@ -931,7 +933,6 @@ DEPENDENCIES
  cucumber-rails (= 1.4.5)
  database_cleaner (= 1.5.3)
  devise (= 4.2.0)
  devise-token_authenticatable (= 0.5.2)
  devise_lastseenable (= 0.0.6)
  diaspora-prosody-config (= 0.0.7)
  diaspora_federation-rails (= 0.1.5)
@@ -998,6 +999,7 @@ DEPENDENCIES
  rails-assets-autosize (= 3.0.17)!
  rails-assets-blueimp-gallery (= 2.21.3)!
  rails-assets-bootstrap-markdown (= 2.10.0)!
  rails-assets-corejs-typeahead (= 1.0.1)!
  rails-assets-diaspora_jsxc (= 0.1.5.develop.7)!
  rails-assets-highlightjs (= 9.7.0)!
  rails-assets-jasmine-ajax (= 3.2.0)!
@@ -1034,6 +1036,7 @@ DEPENDENCIES
  spring (= 2.0.0)
  spring-commands-cucumber (= 1.0.1)
  spring-commands-rspec (= 1.0.4)
  string-direction (= 1.2.0)
  test_after_commit (= 1.1.0)
  timecop (= 0.8.1)
  turbo_dev_assets (= 0.0.2)
@@ -1049,4 +1052,4 @@ DEPENDENCIES
  will_paginate (= 3.1.5)

BUNDLED WITH
   1.13.5
   1.13.6
+2 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ var app = {

  setupHeader: function() {
    if(app.currentUser.authenticated()) {
      app.notificationsCollection = new app.collections.Notifications();
      app.header = new app.views.Header();
      $("header").prepend(app.header.el);
      app.header.render();
@@ -114,6 +115,7 @@ var app = {
      // so we use Backbone.history.navigate instead.
      var change = Backbone.history.navigate(link.attr("href").substring(1) ,true);
      if(change === undefined) { Backbone.history.loadUrl(link.attr("href").substring(1)); }
      app.notificationsCollection.fetch();
    });
  },

Loading