Unverified Commit 1f3ad2fa authored by Benjamin Neff's avatar Benjamin Neff
Browse files

Merge branch 'release/0.7.3.0'

parents cf2bd660 aff4be88

Changelog.md

+24 −0
Original line number Diff line number Diff line 
# 0.7.3.0



## Refactor

* Work on the data downloads: Fixed general layout of buttons, added a timestamp and implemented auto-deletion of old exports [#7684](https://github.com/diaspora/diaspora/pull/7684)

* Increase Twitter character limit to 280 [#7694](https://github.com/diaspora/diaspora/pull/7694)

* Improve password autocomplete with password managers [#7642](https://github.com/diaspora/diaspora/pull/7642)

* Remove the limit of participants in private conversations [#7705](https://github.com/diaspora/diaspora/pull/7705)

* Send blocks to the blocked persons pod for better UX [#7705](https://github.com/diaspora/diaspora/pull/7705)

* Send a dummy participation on all incoming public posts to increase interaction consistency [#7708](https://github.com/diaspora/diaspora/pull/7708)



## Bug fixes

* Fix invite link on the contacts page when the user has no contacts [#7690](https://github.com/diaspora/diaspora/pull/7690)

* Fix the mobile bookmarklet when called without parameters [#7698](https://github.com/diaspora/diaspora/pull/7698)

* Properly build the #newhere message for people who got invited [#7702](https://github.com/diaspora/diaspora/pull/7702)

* Fix the admin report view for posts without text [#7706](https://github.com/diaspora/diaspora/pull/7706)

* Upgrade Nokogiri to fix [a disclosed vulnerability in libxml2](https://github.com/sparklemotion/nokogiri/issues/1714)



## Features

* Check if redis is running in script/server [#7685](https://github.com/diaspora/diaspora/pull/7685)



# 0.7.2.1



Fixes notifications when people remove their birthday date [#7691](https://github.com/diaspora/diaspora/pull/7691)



# 0.7.2.0



## Bug fixes

Gemfile

+4 −4
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ gem "unicorn-worker-killer", "0.4.4" 


# Federation



gem "diaspora_federation-json_schema", "0.2.2"

gem "diaspora_federation-rails", "0.2.2"

gem "diaspora_federation-json_schema", "0.2.3"

gem "diaspora_federation-rails", "0.2.3"



# API and JSON
@@ -137,7 +137,7 @@ gem "leaflet-rails", "1.2.0" 


# Parsing



gem "nokogiri",          "1.8.1"

gem "nokogiri",          "1.8.2"

gem "open_graph_reader", "0.6.2" # also update User-Agent in features/support/webmock.rb

gem "redcarpet",         "3.4.0"

gem "ruby-oembed",       "0.12.0"
@@ -292,7 +292,7 @@ group :test do 
  gem "timecop",            "0.9.1"

  gem "webmock",            "3.0.1", require: false



  gem "diaspora_federation-test", "0.2.2"

  gem "diaspora_federation-test", "0.2.3"



  # Coverage

  gem "coveralls", "0.8.21", require: false

Gemfile.lock

+15 −15
Original line number Diff line number Diff line
@@ -166,18 +166,18 @@ GEM 
      devise

      rails (>= 3.0.4)

    diaspora-prosody-config (0.0.7)

    diaspora_federation (0.2.2)

      faraday (>= 0.9.0, < 0.14.0)

    diaspora_federation (0.2.3)

      faraday (>= 0.9.0, < 0.15.0)

      faraday_middleware (>= 0.10.0, < 0.13.0)

      nokogiri (~> 1.6, >= 1.6.8)

      typhoeus (~> 1.0)

      valid (~> 1.0)

    diaspora_federation-json_schema (0.2.2)

    diaspora_federation-rails (0.2.2)

    diaspora_federation-json_schema (0.2.3)

    diaspora_federation-rails (0.2.3)

      actionpack (>= 4.2, < 6)

      diaspora_federation (= 0.2.2)

    diaspora_federation-test (0.2.2)

      diaspora_federation (= 0.2.2)

      diaspora_federation (= 0.2.3)

    diaspora_federation-test (0.2.3)

      diaspora_federation (= 0.2.3)

      fabrication (~> 2.16)

      uuid (~> 2.3, >= 2.3.8)

    diff-lcs (1.3)
@@ -194,7 +194,7 @@ GEM 
      rake

    et-orbi (1.0.5)

      tzinfo

    ethon (0.10.1)

    ethon (0.11.0)

      ffi (>= 1.3.0)

    excon (0.59.0)

    execjs (2.7.0)
@@ -204,7 +204,7 @@ GEM 
      sigar (~> 0.7.3)

      state_machines

      thor

    fabrication (2.16.3)

    fabrication (2.20.1)

    factory_girl (4.8.0)

      activesupport (>= 3.0.0)

    factory_girl_rails (4.8.0)
@@ -389,7 +389,7 @@ GEM 
    naught (1.1.0)

    nenv (0.3.0)

    nio4r (2.1.0)

    nokogiri (1.8.1)

    nokogiri (1.8.2)

      mini_portile2 (~> 2.3.0)

    notiffany (0.1.1)

      nenv (~> 0.1)
@@ -783,9 +783,9 @@ DEPENDENCIES 
  devise (= 4.3.0)

  devise_lastseenable (= 0.0.6)

  diaspora-prosody-config (= 0.0.7)

  diaspora_federation-json_schema (= 0.2.2)

  diaspora_federation-rails (= 0.2.2)

  diaspora_federation-test (= 0.2.2)

  diaspora_federation-json_schema (= 0.2.3)

  diaspora_federation-rails (= 0.2.3)

  diaspora_federation-test (= 0.2.3)

  entypo-rails (= 3.0.0)

  eye (= 0.9.2)

  factory_girl_rails (= 4.8.0)
@@ -820,7 +820,7 @@ DEPENDENCIES 
  minitest

  mobile-fu (= 1.4.0)

  mysql2 (= 0.4.9)

  nokogiri (= 1.8.1)

  nokogiri (= 1.8.2)

  omniauth (= 1.6.1)

  omniauth-facebook (= 4.0.0)

  omniauth-tumblr (= 1.2)
@@ -904,4 +904,4 @@ DEPENDENCIES 
  will_paginate (= 3.1.6)



BUNDLED WITH

   1.15.4
 
   1.16.1

app/assets/javascripts/app/pages/contacts.js

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ app.pages.Contacts = Backbone.View.extend({ 
    "click #chat_privilege_toggle" : "toggleChatPrivilege",

    "click #change_aspect_name" : "showAspectNameForm",

    "click .conversation_button": "showMessageModal",

    "click #invitations-button": "showInvitationsModal"

    "click .invitations-button": "showInvitationsModal"

  },



  initialize: function(opts) {

app/assets/javascripts/app/router.js

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ app.Router = Backbone.Router.extend({ 
  },



  spotlight: function() {

    $("#invitations-button").click(function() {

    $(".invitations-button").click(function() {

      app.helpers.showModal("#invitationsModal");

    });

  },