Unverified Commit 1702cc1c authored by Benjamin Neff's avatar Benjamin Neff
Browse files

Merge branch 'release/0.6.3.0'

parents 55219372 3d992160
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -86,3 +86,6 @@ diaspora.iml

# Dolphin's directory's preferences files
*.directory

# WebTranslateIt
.wti
+1 −0
Original line number Diff line number Diff line
@@ -3,3 +3,4 @@
--color
--tag ~performance
--order random
--require spec_helper
+113 −0
Original line number Diff line number Diff line
# 0.6.3.0

## Refactor
* Increase the spacing above and below post contents [#7267](https://github.com/diaspora/diaspora/pull/7267)
* Replace fileuploader-custom with FineUploader [#7083](https://github.com/diaspora/diaspora/pull/7083)
* Always show mobile reaction counts [#7207](https://github.com/diaspora/diaspora/pull/7207)
* Refactor mobile alerts for error responses [#7227](https://github.com/diaspora/diaspora/pull/7227)
* Switch content and given reason in the reports overview [#7180](https://github.com/diaspora/diaspora/pull/7180)

## Bug fixes
* Fix background color of year on notifications page with dark theme [#7263](https://github.com/diaspora/diaspora/pull/7263)
* Fix jasmine tests in firefox [#7246](https://github.com/diaspora/diaspora/pull/7246)
* Prevent scroll to top when clicking 'mark all as read' in the notification dropdown [#7253](https://github.com/diaspora/diaspora/pull/7253)
* Update existing notifications in dropdown on fetch [#7270](https://github.com/diaspora/diaspora/pull/7270)
* Fix link to post on mobile photo page [#7274](https://github.com/diaspora/diaspora/pull/7274)
* Fix some background issues on dark mobile themes [#7278](https://github.com/diaspora/diaspora/pull/7278)

## Features
* Add links to the aspects and followed tags pages on mobile [#7265](https://github.com/diaspora/diaspora/pull/7265)
* diaspora\* is now available in Gàidhlig, Occitan, and Schwiizerdütsch

# 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.

## Refactor
* Indicate proper way to report bugs in the sidebar [#7039](https://github.com/diaspora/diaspora/pull/7039)
* Remove text color from notification mails and fix sender avatar [#7054](https://github.com/diaspora/diaspora/pull/7054)
* Make the session cookies HttpOnly again [#7041](https://github.com/diaspora/diaspora/pull/7041)
* Invalidate sessions with invalid CSRF tokens [#7050](https://github.com/diaspora/diaspora/pull/7050)
* Liking a post will no longer update its interacted timestamp [#7030](https://github.com/diaspora/diaspora/pull/7030)
* Improve W3C compliance [#7068](https://github.com/diaspora/diaspora/pull/7068) [#7082](https://github.com/diaspora/diaspora/pull/7082) [#7091](https://github.com/diaspora/diaspora/pull/7091) [#7092](https://github.com/diaspora/diaspora/pull/7092)
* Load jQuery in the head on mobile [#7086](https://github.com/diaspora/diaspora/pull/7086)
* Use translation for NodeInfo services [#7102](https://github.com/diaspora/diaspora/pull/7102)
* Adopt new Mapbox tile URIs [#7066](https://github.com/diaspora/diaspora/pull/7066)
* Refactored post interactions on the single post view [#7089](https://github.com/diaspora/diaspora/pull/7089)
* Extract inline JavaScript [#7113](https://github.com/diaspora/diaspora/pull/7113)
* Port conversations inbox to backbone.js [#7108](https://github.com/diaspora/diaspora/pull/7108)
* Refactored stream shortcuts for more flexibility [#7127](https://github.com/diaspora/diaspora/pull/7127)
* Link to admin dashboard instead of admin panel from the podmin landing page [#7130](https://github.com/diaspora/diaspora/pull/7130)

## Bug fixes
* Post comments no longer get collapsed when interacting with a post [#7040](https://github.com/diaspora/diaspora/pull/7040)
* Closed accounts will no longer show up in the account search [#7042](https://github.com/diaspora/diaspora/pull/7042)
* Code blocks in conversations no longer overflow the content [#7055](https://github.com/diaspora/diaspora/pull/7055)
* More buttons in mobile streams are fixed [#7036](https://github.com/diaspora/diaspora/pull/7036)
* Fixed missing sidebar background in the contacts tab [#7064](https://github.com/diaspora/diaspora/pull/7064)
* Fix tags URLs in hovercards [#7075](https://github.com/diaspora/diaspora/pull/7075)
* Fix 500 in html requests for post interactions [#7085](https://github.com/diaspora/diaspora/pull/7085)
* Remove whitespaces next to like link in stream [#7088](https://github.com/diaspora/diaspora/pull/7088)
* Prevent overflow of interaction avatars in the single post view [#7070](https://github.com/diaspora/diaspora/pull/7070)
* Fix moving publisher on first click after page load [#7094](https://github.com/diaspora/diaspora/pull/7094)
* Fix link to comment on report page [#7105](https://github.com/diaspora/diaspora/pull/7105)
* Fix duplicate flash message on mobile profile edit [#7107](https://github.com/diaspora/diaspora/pull/7107)
* Clicking photos on mobile should no longer cause 404s [#7071](https://github.com/diaspora/diaspora/pull/7071)
* Fix avatar size on mobile privacy page for ignored people [#7148](https://github.com/diaspora/diaspora/pull/7148)
* Don't display tag following button when logged out [#7155](https://github.com/diaspora/diaspora/pull/7155)
* Fix message modal on profile page [#7137](https://github.com/diaspora/diaspora/pull/7137)
* Display error message when aspect membership changes fail [#7132](https://github.com/diaspora/diaspora/pull/7132)
* Avoid the creation of pod that are none [#7145](https://github.com/diaspora/diaspora/pull/7145)
* Fixed tag pages with alternate default aspect settings [#7262](https://github.com/diaspora/diaspora/pull/7162)
* Suppressed CSP related deprecation warnings [#7263](https://github.com/diaspora/diaspora/pull/7163)

## Features
* Deleted comments will be removed when loading more comments [#7045](https://github.com/diaspora/diaspora/pull/7045)
* The "subscribe" indicator on a post now gets toggled when you like or rehsare a post [#7040](https://github.com/diaspora/diaspora/pull/7040)
* Add OpenGraph video support [#7043](https://github.com/diaspora/diaspora/pull/7043)
* You'll now get redirected to the invites page if you follow an invitation but you're already logged in [#7061](https://github.com/diaspora/diaspora/pull/7061)
* Add support for setting BOSH access protocol via chat configuration [#7100](https://github.com/diaspora/diaspora/pull/7100)
* Add number of unreviewed reports to admin dashboard and admin sidebar [#7109](https://github.com/diaspora/diaspora/pull/7109)
* Don't federate to pods that have been offline for an extended period of time [#7120](https://github.com/diaspora/diaspora/pull/7120)
* Add In-Reply-To and References headers to notification mails [#7122](https://github.com/diaspora/diaspora/pull/7122)
* Directly link to a comment in commented notification mails [#7124](https://github.com/diaspora/diaspora/pull/7124)
* Add optional `Content-Security-Policy` header [#7128](https://github.com/diaspora/diaspora/pull/7128)
* Add links to main stream and public stream to the mobile drawer [#7144](https://github.com/diaspora/diaspora/pull/7144)
* Allow opening search results from the dropdown in a new tab [#7021](https://github.com/diaspora/diaspora/issues/7021)
* Add user setting for default post visibility [#7118](https://github.com/diaspora/diaspora/issues/7118)

# 0.6.0.1

Fixes an issue with installing an running diaspora\*, caused by a recent bundler update that fixes a bundler bug on which we depended on.
+44 −40
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ gem "rails", "4.2.7.1"

# Legacy Rails features, remove me!
# responders (class level)
gem "responders", "2.2.0"
gem "responders", "2.3.0"

# Appserver

@@ -13,19 +13,18 @@ gem "unicorn-worker-killer", "0.4.4"

# Federation

gem "diaspora_federation-rails", "0.1.4"
gem "diaspora_federation-rails", "0.1.7"

# API and JSON

gem "acts_as_api", "0.4.3"
gem "json",        "1.8.3"
gem "json-schema", "2.6.2"
gem "json-schema", "2.7.0"

# Authentication

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

# Captcha

@@ -33,16 +32,15 @@ gem "simple_captcha2", "0.4.0", require: "simple_captcha"

# Background processing

gem "sidekiq", "4.1.4"
gem "sinatra", "1.4.7"
gem "sidekiq", "4.2.2"

# Scheduled processing

gem "sidekiq-cron", "0.4.2"
gem "sidekiq-cron", "0.4.4"

# Compression

gem "uglifier", "3.0.1"
gem "uglifier", "3.0.2"

# Configuration

@@ -57,7 +55,7 @@ gem "rack-cors", "0.4.0", require: "rack/cors"
gem "bootstrap-sass", "3.3.7"
gem "compass-rails",  "2.0.5"
gem "sass-rails",     "5.0.6"
gem "autoprefixer-rails", "6.4.0.2"
gem "autoprefixer-rails", "6.5.1"
gem "bootstrap-switch-rails", "3.3.3"

# Database
@@ -66,7 +64,7 @@ group :mysql, optional: true do
  gem "mysql2", "0.4.4"
end
group :postgresql, optional: true do
  gem "pg",     "0.18.4"
  gem "pg",     "0.19.0"
end


@@ -74,10 +72,9 @@ 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"
gem "remotipart",  "1.2.1"

# GUID generation
gem "uuid", "2.3.8"
@@ -88,32 +85,35 @@ gem "entypo-rails", "3.0.0.pre.rc2"

# JavaScript

gem "backbone-on-rails", "1.2.0.0"
gem "handlebars_assets", "0.23.1"
gem "jquery-rails",      "4.1.1"
gem "jquery-rails",      "4.2.1"
gem "jquery-ui-rails",   "5.0.5"
gem "js_image_paths",    "0.1.0"
gem "js-routes",         "1.2.9"

source "https://rails-assets.org" do
  gem "rails-assets-jquery",                              "2.2.1" # Should be kept in sync with jquery-rails
  gem "rails-assets-jquery",                              "2.2.4" # Should be kept in sync with jquery-rails

  gem "rails-assets-markdown-it",                         "7.0.0"
  gem "rails-assets-markdown-it",                         "8.2.2"
  gem "rails-assets-markdown-it-hashtag",                 "0.4.0"
  gem "rails-assets-markdown-it-diaspora-mention",        "1.0.0"
  gem "rails-assets-markdown-it-sanitizer",               "0.4.2"
  gem "rails-assets-markdown-it-diaspora-mention",        "1.1.0"
  gem "rails-assets-markdown-it-sanitizer",               "0.4.3"
  gem "rails-assets-markdown-it--markdown-it-for-inline", "0.1.1"
  gem "rails-assets-markdown-it-sub",                     "1.0.0"
  gem "rails-assets-markdown-it-sup",                     "1.0.0"
  gem "rails-assets-highlightjs",                         "9.6.0"
  gem "rails-assets-highlightjs",                         "9.7.0"

  gem "rails-assets-backbone",                            "1.3.3"
  gem "rails-assets-bootstrap-markdown",                  "2.10.0"
  gem "rails-assets-corejs-typeahead",                    "1.0.1"
  gem "rails-assets-fineuploader-dist",                   "5.11.0"

  # jQuery plugins

  gem "rails-assets-jquery-placeholder",            "2.3.1"
  gem "rails-assets-jquery-textchange",             "0.2.3"
  gem "rails-assets-perfect-scrollbar",             "0.6.12"
  gem "rails-assets-autosize",                      "3.0.17"
  gem "rails-assets-autosize",                      "3.0.20"
  gem "rails-assets-blueimp-gallery",               "2.21.3"
end

@@ -132,12 +132,20 @@ gem "leaflet-rails", "0.7.7"

# Parsing

gem "nokogiri",          "1.6.8"
gem "nokogiri",          "1.6.8.1"
gem "redcarpet",         "3.3.4"
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"

# Services

gem "omniauth",           "1.3.1"
@@ -155,8 +163,8 @@ gem "openid_connect", "0.12.0"
gem "active_model_serializers", "0.9.5"

# XMPP chat dependencies
gem "diaspora-prosody-config",    "0.0.5"
gem "rails-assets-diaspora_jsxc", "0.1.5.develop.1", source: "https://rails-assets.org"
gem "diaspora-prosody-config",    "0.0.7"
gem "rails-assets-diaspora_jsxc", "0.1.5.develop.7", source: "https://rails-assets.org"

# Tags

@@ -164,7 +172,7 @@ gem "acts-as-taggable-on", "3.5.0"

# URIs and HTTP

gem "addressable",        "2.3.8", require: "addressable/uri"
gem "addressable",        "2.4.0", require: "addressable/uri"
gem "faraday",            "0.9.2"
gem "faraday_middleware", "0.10.0"
gem "faraday-cookie_jar", "0.0.6"
@@ -173,9 +181,9 @@ gem "typhoeus", "1.1.0"
# Views

gem "gon",                     "6.1.0"
gem "hamlit",                  "2.5.0"
gem "hamlit",                  "2.7.5"
gem "mobile-fu",               "1.3.1"
gem "will_paginate",           "3.1.0"
gem "will_paginate",           "3.1.5"
gem "rails-timeago",           "2.11.0"

# Logging
@@ -212,10 +220,6 @@ group :production do # we don"t install these on travis to speed up test runs
  gem "rack-google-analytics", "1.2.0"
  gem "rack-piwik",            "0.3.0",  require: "rack/piwik"

  # Click-jacking protection

  gem "rack-protection", "1.5.3"

  # Process management

  gem "eye", "0.8.1"
@@ -241,8 +245,8 @@ group :development do

  # Linters
  gem "rubocop",        "0.40.0"
  gem "haml_lint",      "0.18.1"
  gem "pronto",         "0.7.0"
  gem "haml_lint",      "0.18.2"
  gem "pronto",         "0.7.1"
  gem "pronto-eslint",  "0.7.0"
  gem "pronto-rubocop", "0.7.0"
  gem "pronto-haml",    "0.7.0"
@@ -250,7 +254,7 @@ group :development do

  # Preloading environment

  gem "spring", "1.7.2"
  gem "spring", "2.0.0"
  gem "spring-commands-rspec", "1.0.4"
  gem "spring-commands-cucumber", "1.0.1"

@@ -268,14 +272,14 @@ group :test do
  # RSpec (unit tests, some integration tests)

  gem "fixture_builder",   "0.4.1"
  gem "fuubar",            "2.1.1"
  gem "fuubar",            "2.2.0"
  gem "test_after_commit", "1.1.0"

  # Cucumber (integration tests)

  gem "capybara",           "2.7.1"
  gem "capybara",           "2.10.1"
  gem "database_cleaner",   "1.5.3"
  gem "poltergeist",        "1.10.0"
  gem "poltergeist",        "1.11.0"

  gem "cucumber-api-steps", "0.13", require: false
  gem "json_spec", "1.1.4"
@@ -287,7 +291,7 @@ group :test do
  gem "webmock",            "2.1.0", require: false
  gem "shoulda-matchers",   "3.1.1"

  gem "diaspora_federation-test", "0.1.4"
  gem "diaspora_federation-test", "0.1.7"

  # Coverage
  gem 'coveralls', require: false
@@ -295,13 +299,13 @@ end

group :development, :test do
  # RSpec (unit tests, some integration tests)
  gem "rspec-rails", "3.5.1"
  gem "rspec-rails", "3.5.2"

  # Cucumber (integration tests)
  gem "cucumber-rails", "1.4.4", require: false
  gem "cucumber-rails", "1.4.5", require: false

  # Jasmine (client side application tests (JS))
  gem "jasmine",                   "2.4.0"
  gem "jasmine",                   "2.5.1"
  gem "jasmine-jquery-rails",      "2.0.3"
  gem "rails-assets-jasmine-ajax", "3.2.0", source: "https://rails-assets.org"
  gem "sinon-rails",               "1.15.0"
+110 −115

File changed.

Preview size limit exceeded, changes collapsed.

Loading