Merge branch 'release/0.6.1.0' (b88f53a3) · Commits · Gigadoc 2 / diaspora

Changelog.md

+57 −0

Original line number	Diff line number	Diff line
		# 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.

Gemfile

+33 −35

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,13 +13,13 @@ gem "unicorn-worker-killer", "0.4.4"

		# Federation

		gem "diaspora_federation-rails", "0.1.4"
		gem "diaspora_federation-rails", "0.1.5"

		# 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

		@@ -33,16 +33,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 +56,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 +65,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


		@@ -77,7 +76,6 @@ gem "activerecord-import", "0.15.0"
		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"
		@@ -90,22 +88,22 @@ gem "entypo-rails", "3.0.0.pre.rc2"

		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.0.0"
		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-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-bootstrap-markdown", "2.10.0"

		# jQuery plugins
		@@ -132,12 +130,16 @@ 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"

		# Security Headers

		gem "secure_headers", "3.5.0"

		# Services

		gem "omniauth", "1.3.1"
		@@ -155,8 +157,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 +166,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 +175,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 +214,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 +239,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 +248,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 +266,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 +285,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.5"

		# Coverage
		gem 'coveralls', require: false
		@@ -295,13 +293,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"

Gemfile.lock

+88 −90

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ GEM
		activemodel (>= 3.0.0)
		activesupport (>= 3.0.0)
		rack (>= 1.1.0)
		addressable (2.3.8)
		addressable (2.4.0)
		arel (6.0.3)
		asset_sync (1.1.0)
		activemodel
		@@ -56,7 +56,7 @@ GEM
		unf
		ast (2.3.0)
		attr_required (1.0.1)
		autoprefixer-rails (6.4.0.2)
		autoprefixer-rails (6.5.1)
		execjs
		backbone-on-rails (1.2.0.0)
		eco
		@@ -72,7 +72,7 @@ GEM
		buftok (0.2.0)
		builder (3.2.2)
		byebug (9.0.5)
		capybara (2.7.1)
		capybara (2.10.1)
		addressable
		mime-types (>= 1.16)
		nokogiri (>= 1.3.3)
		@@ -157,9 +157,9 @@ GEM
		rspec (>= 2.12.0)
		cucumber-core (1.5.0)
		gherkin (~> 4.0)
		cucumber-rails (1.4.4)
		cucumber-rails (1.4.5)
		capybara (>= 1.1.2, < 3)
		cucumber (>= 1.3.8, < 3)
		cucumber (>= 1.3.8, < 4)
		mime-types (>= 1.16, < 4)
		nokogiri (~> 1.5)
		railties (>= 3, < 5.1)
		@@ -176,18 +176,18 @@ GEM
		devise_lastseenable (0.0.6)
		devise
		rails (>= 3.0.4)
		diaspora-prosody-config (0.0.5)
		diaspora_federation (0.1.4)
		diaspora-prosody-config (0.0.7)
		diaspora_federation (0.1.5)
		faraday (~> 0.9.0)
		faraday_middleware (~> 0.10.0)
		nokogiri (~> 1.6, >= 1.6.8)
		typhoeus (~> 1.0)
		valid (~> 1.0)
		diaspora_federation-rails (0.1.4)
		diaspora_federation (= 0.1.4)
		diaspora_federation-rails (0.1.5)
		diaspora_federation (= 0.1.5)
		rails (~> 4.2)
		diaspora_federation-test (0.1.4)
		diaspora_federation (= 0.1.4)
		diaspora_federation-test (0.1.5)
		diaspora_federation (= 0.1.5)
		factory_girl (~> 4.7)
		diff-lcs (1.2.5)
		docile (1.1.5)
		@@ -207,7 +207,7 @@ GEM
		execjs
		multi_json (>= 1.3)
		rake
		ethon (0.9.0)
		ethon (0.9.1)
		ffi (>= 1.3.0)
		excon (0.49.0)
		execjs (2.7.0)
		@@ -365,13 +365,13 @@ GEM
		font-awesome-rails (4.6.3.1)
		railties (>= 3.2, < 5.1)
		formatador (0.2.5)
		fuubar (2.1.1)
		rspec (~> 3.0)
		fuubar (2.2.0)
		rspec-core (~> 3.0)
		ruby-progressbar (~> 1.4)
		get_process_mem (0.2.1)
		gherkin (4.0.0)
		gitlab (3.6.1)
		httparty
		gitlab (3.7.0)
		httparty (~> 0.13.0)
		terminal-table
		globalid (0.3.7)
		activesupport (>= 4.1.0)
		@@ -403,12 +403,12 @@ GEM
		rubocop (~> 0.20)
		haml (4.0.7)
		tilt
		haml_lint (0.18.1)
		haml_lint (0.18.2)
		haml (~> 4.0)
		rake (>= 10, < 12)
		rubocop (>= 0.36.0)
		sysexits (~> 1.1)
		hamlit (2.5.0)
		hamlit (2.7.5)
		temple (~> 0.7.6)
		thor
		tilt
		@@ -444,14 +444,14 @@ GEM
		railties (>= 3.0.0)
		inflecto (0.0.2)
		ipaddress (0.8.3)
		jasmine (2.4.0)
		jasmine-core (~> 2.4)
		jasmine (2.5.1)
		jasmine-core (>= 2.5.1, < 3.0.0)
		phantomjs
		rack (>= 1.2.1)
		rake
		jasmine-core (2.4.1)
		jasmine-core (2.5.2)
		jasmine-jquery-rails (2.0.3)
		jquery-rails (4.1.1)
		jquery-rails (4.2.1)
		rails-dom-testing (>= 1, < 3)
		railties (>= 4.2.0)
		thor (>= 0.14, < 2.0)
		@@ -469,8 +469,8 @@ GEM
		multi_json (>= 1.3)
		securecompare
		url_safe_base64
		json-schema (2.6.2)
		addressable (~> 2.3.8)
		json-schema (2.7.0)
		addressable (>= 2.4)
		json_spec (1.1.4)
		multi_json (~> 1.0)
		rspec (>= 2.0, < 4.0)
		@@ -509,7 +509,7 @@ GEM
		mimemagic (0.3.1)
		mini_magick (4.5.1)
		mini_portile2 (2.1.0)
		minitest (5.9.0)
		minitest (5.9.1)
		mobile-fu (1.3.1)
		rack-mobile-detect
		rails
		@@ -522,9 +522,8 @@ GEM
		nenv (0.3.0)
		nested_form (0.3.2)
		nio4r (1.2.1)
		nokogiri (1.6.8)
		nokogiri (1.6.8.1)
		mini_portile2 (~> 2.1.0)
		pkg-config (~> 1.1.7)
		notiffany (0.1.1)
		nenv (~> 0.1)
		shellany (~> 0.0)
		@@ -571,17 +570,16 @@ GEM
		validate_url
		webfinger (>= 1.0.1)
		orm_adapter (0.5.0)
		parser (2.3.1.2)
		parser (2.3.1.4)
		ast (~> 2.2)
		pg (0.18.4)
		pg (0.19.0)
		phantomjs (2.1.1.0)
		pkg-config (1.1.7)
		poltergeist (1.10.0)
		poltergeist (1.11.0)
		capybara (~> 2.1)
		cliver (~> 0.3.1)
		websocket-driver (>= 0.2.0)
		powerpack (0.1.1)
		pronto (0.7.0)
		pronto (0.7.1)
		gitlab (~> 3.6, >= 3.4.0)
		httparty (~> 0.13.7)
		octokit (~> 4.3, >= 4.1.0)
		@@ -650,19 +648,20 @@ GEM
		rails-assets-jquery (>= 1.9.1, < 4)
		rails-assets-bootstrap-markdown (2.10.0)
		rails-assets-bootstrap (~> 3)
		rails-assets-diaspora_jsxc (0.1.5.develop.1)
		rails-assets-favico.js (~> 0.3.9)
		rails-assets-jquery (>= 1.11)
		rails-assets-diaspora_jsxc (0.1.5.develop.7)
		rails-assets-emojione (~> 2.0.1)
		rails-assets-favico.js (>= 0.3.10, < 0.4)
		rails-assets-jquery-colorbox (~> 1.6.3)
		rails-assets-jquery-fullscreen-plugin (~> 0.5.0)
		rails-assets-jquery.slimscroll (~> 1.3.6)
		rails-assets-jquery.ui (~> 1.11.4)
		rails-assets-emojione (2.0.1)
		rails-assets-favico.js (0.3.10)
		rails-assets-highlightjs (9.6.0)
		rails-assets-highlightjs (9.7.0)
		rails-assets-jasmine (2.4.1)
		rails-assets-jasmine-ajax (3.2.0)
		rails-assets-jasmine (~> 2)
		rails-assets-jquery (2.2.1)
		rails-assets-jquery (2.2.4)
		rails-assets-jquery-colorbox (1.6.4)
		rails-assets-jquery (>= 1.3.2)
		rails-assets-jquery-fullscreen-plugin (0.5.0)
		@@ -674,10 +673,10 @@ GEM
		rails-assets-jquery.ui (1.11.4)
		rails-assets-jquery (>= 1.6)
		rails-assets-markdown-it--markdown-it-for-inline (0.1.1)
		rails-assets-markdown-it (7.0.0)
		rails-assets-markdown-it (8.0.0)
		rails-assets-markdown-it-diaspora-mention (1.0.0)
		rails-assets-markdown-it-hashtag (0.4.0)
		rails-assets-markdown-it-sanitizer (0.4.2)
		rails-assets-markdown-it-sanitizer (0.4.3)
		rails-assets-markdown-it-sub (1.0.0)
		rails-assets-markdown-it-sup (1.0.0)
		rails-assets-perfect-scrollbar (0.6.12)
		@@ -716,7 +715,7 @@ GEM
		thor (>= 0.18.1, < 2.0)
		rainbow (2.1.0)
		raindrops (0.16.0)
		rake (11.2.2)
		rake (11.3.0)
		rb-fsevent (0.9.7)
		rb-inotify (0.9.7)
		ffi (>= 0.5.0)
		@@ -730,13 +729,13 @@ GEM
		redis (~> 3.0, >= 3.0.4)
		remotipart (1.2.1)
		request_store (1.3.1)
		responders (2.2.0)
		responders (2.3.0)
		railties (>= 4.2.0, < 5.1)
		rspec (3.5.0)
		rspec-core (~> 3.5.0)
		rspec-expectations (~> 3.5.0)
		rspec-mocks (~> 3.5.0)
		rspec-core (3.5.2)
		rspec-core (3.5.4)
		rspec-support (~> 3.5.0)
		rspec-expectations (3.5.0)
		diff-lcs (>= 1.2.0, < 2.0)
		@@ -744,7 +743,7 @@ GEM
		rspec-mocks (3.5.0)
		diff-lcs (>= 1.2.0, < 2.0)
		rspec-support (~> 3.5.0)
		rspec-rails (3.5.1)
		rspec-rails (3.5.2)
		actionpack (>= 3.0)
		activesupport (>= 3.0)
		railties (>= 3.0)
		@@ -763,7 +762,7 @@ GEM
		ruby-progressbar (1.8.1)
		ruby_dep (1.3.1)
		rubyzip (1.2.0)
		rufus-scheduler (3.2.1)
		rufus-scheduler (3.2.2)
		rugged (0.24.0)
		safe_yaml (1.0.4)
		sass (3.4.22)
		@@ -779,19 +778,21 @@ GEM
		scss_lint (0.49.0)
		rake (>= 0.9, < 12)
		sass (~> 3.4.20)
		secure_headers (3.5.0)
		useragent
		securecompare (1.0.0)
		shellany (0.0.1)
		shoulda-matchers (3.1.1)
		activesupport (>= 4.0.0)
		sidekiq (4.1.4)
		sidekiq (4.2.2)
		concurrent-ruby (~> 1.0)
		connection_pool (~> 2.2, >= 2.2.0)
		rack-protection (~> 1.5)
		redis (~> 3.2, >= 3.2.1)
		sinatra (>= 1.4.7)
		sidekiq-cron (0.4.2)
		sidekiq-cron (0.4.4)
		redis-namespace (>= 1.5.2)
		rufus-scheduler (>= 2.0.24)
		sidekiq (>= 4.0.0)
		sidekiq (>= 4.2.1)
		sigar (0.7.3)
		simple_captcha2 (0.4.0)
		rails (>= 4.1)
		@@ -801,14 +802,11 @@ GEM
		json (>= 1.8, < 3)
		simplecov-html (~> 0.10.0)
		simplecov-html (0.10.0)
		sinatra (1.4.7)
		rack (~> 1.5)
		rack-protection (~> 1.4)
		tilt (>= 1.3, < 3)
		sinon-rails (1.15.0)
		railties (>= 3.1)
		slop (3.6.0)
		spring (1.7.2)
		spring (2.0.0)
		activesupport (>= 4.2)
		spring-commands-cucumber (1.0.1)
		spring (>= 0.9.1)
		spring-commands-rspec (1.0.4)
		@@ -834,7 +832,8 @@ GEM
		temple (0.7.7)
		term-ansicolor (1.3.2)
		tins (~> 1.0)
		terminal-table (1.6.0)
		terminal-table (1.7.3)
		unicode-display_width (~> 1.1.1)
		test_after_commit (1.1.0)
		activerecord (>= 3.2)
		thor (0.19.1)
		@@ -863,12 +862,12 @@ GEM
		ethon (>= 0.9.0)
		tzinfo (1.2.2)
		thread_safe (~> 0.1)
		uglifier (3.0.1)
		uglifier (3.0.2)
		execjs (>= 0.3.0, < 3)
		unf (0.1.4)
		unf_ext
		unf_ext (0.0.7.2)
		unicode-display_width (1.1.0)
		unicode-display_width (1.1.1)
		unicorn (5.1.0)
		kgio (~> 2.6)
		raindrops (~> 0.7)
		@@ -876,6 +875,7 @@ GEM
		get_process_mem (~> 0)
		unicorn (>= 4, < 6)
		url_safe_base64 (0.2.2)
		useragent (0.16.8)
		uuid (2.3.8)
		macaddr (~> 1.0)
		valid (1.2.0)
		@@ -902,7 +902,7 @@ GEM
		websocket-driver (0.6.4)
		websocket-extensions (>= 0.1.0)
		websocket-extensions (0.1.2)
		will_paginate (3.1.0)
		will_paginate (3.1.5)
		xml-simple (1.1.5)
		xpath (2.0.0)
		nokogiri (~> 1.3)
		@@ -916,26 +916,26 @@ DEPENDENCIES
		activerecord-import (= 0.15.0)
		acts-as-taggable-on (= 3.5.0)
		acts_as_api (= 0.4.3)
		addressable (= 2.3.8)
		addressable (= 2.4.0)
		asset_sync (= 1.1.0)
		autoprefixer-rails (= 6.4.0.2)
		autoprefixer-rails (= 6.5.1)
		backbone-on-rails (= 1.2.0.0)
		bootstrap-sass (= 3.3.7)
		bootstrap-switch-rails (= 3.3.3)
		capybara (= 2.7.1)
		capybara (= 2.10.1)
		carrierwave (= 0.11.2)
		compass-rails (= 2.0.5)
		configurate (= 0.3.1)
		coveralls
		cucumber-api-steps (= 0.13)
		cucumber-rails (= 1.4.4)
		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.5)
		diaspora_federation-rails (= 0.1.4)
		diaspora_federation-test (= 0.1.4)
		diaspora-prosody-config (= 0.0.7)
		diaspora_federation-rails (= 0.1.5)
		diaspora_federation-test (= 0.1.5)
		entypo-rails (= 3.0.0.pre.rc2)
		eye (= 0.8.1)
		factory_girl_rails (= 4.7.0)
		@@ -944,25 +944,25 @@ DEPENDENCIES
		faraday_middleware (= 0.10.0)
		fixture_builder (= 0.4.1)
		fog (= 1.38.0)
		fuubar (= 2.1.1)
		fuubar (= 2.2.0)
		gon (= 6.1.0)
		guard (= 2.14.0)
		guard-cucumber (= 2.1.2)
		guard-rspec (= 4.7.3)
		guard-rubocop (= 1.2.0)
		haml_lint (= 0.18.1)
		hamlit (= 2.5.0)
		haml_lint (= 0.18.2)
		hamlit (= 2.7.5)
		handlebars_assets (= 0.23.1)
		http_accept_language (= 2.0.5)
		i18n-inflector-rails (= 1.0.7)
		jasmine (= 2.4.0)
		jasmine (= 2.5.1)
		jasmine-jquery-rails (= 2.0.3)
		jquery-rails (= 4.1.1)
		jquery-rails (= 4.2.1)
		jquery-ui-rails (= 5.0.5)
		js-routes (= 1.2.9)
		js_image_paths (= 0.1.0)
		json (= 1.8.3)
		json-schema (= 2.6.2)
		json-schema (= 2.7.0)
		json_spec (= 1.1.4)
		leaflet-rails (= 0.7.7)
		logging-rails (= 0.5.0)
		@@ -971,7 +971,7 @@ DEPENDENCIES
		minitest
		mobile-fu (= 1.3.1)
		mysql2 (= 0.4.4)
		nokogiri (= 1.6.8)
		nokogiri (= 1.6.8.1)
		omniauth (= 1.3.1)
		omniauth-facebook (= 4.0.0)
		omniauth-tumblr (= 1.2)
		@@ -979,9 +979,9 @@ DEPENDENCIES
		omniauth-wordpress (= 0.2.2)
		open_graph_reader (= 0.6.1)
		openid_connect (= 0.12.0)
		pg (= 0.18.4)
		poltergeist (= 1.10.0)
		pronto (= 0.7.0)
		pg (= 0.19.0)
		poltergeist (= 1.11.0)
		pronto (= 0.7.1)
		pronto-eslint (= 0.7.0)
		pronto-haml (= 0.7.0)
		pronto-rubocop (= 0.7.0)
		@@ -992,24 +992,23 @@ DEPENDENCIES
		rack-cors (= 0.4.0)
		rack-google-analytics (= 1.2.0)
		rack-piwik (= 0.3.0)
		rack-protection (= 1.5.3)
		rack-rewrite (= 1.5.1)
		rack-ssl (= 1.4.1)
		rails (= 4.2.7.1)
		rails-assets-autosize (= 3.0.17)!
		rails-assets-blueimp-gallery (= 2.21.3)!
		rails-assets-bootstrap-markdown (= 2.10.0)!
		rails-assets-diaspora_jsxc (= 0.1.5.develop.1)!
		rails-assets-highlightjs (= 9.6.0)!
		rails-assets-diaspora_jsxc (= 0.1.5.develop.7)!
		rails-assets-highlightjs (= 9.7.0)!
		rails-assets-jasmine-ajax (= 3.2.0)!
		rails-assets-jquery (= 2.2.1)!
		rails-assets-jquery (= 2.2.4)!
		rails-assets-jquery-placeholder (= 2.3.1)!
		rails-assets-jquery-textchange (= 0.2.3)!
		rails-assets-markdown-it (= 7.0.0)!
		rails-assets-markdown-it (= 8.0.0)!
		rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)!
		rails-assets-markdown-it-diaspora-mention (= 1.0.0)!
		rails-assets-markdown-it-hashtag (= 0.4.0)!
		rails-assets-markdown-it-sanitizer (= 0.4.2)!
		rails-assets-markdown-it-sanitizer (= 0.4.3)!
		rails-assets-markdown-it-sub (= 1.0.0)!
		rails-assets-markdown-it-sup (= 1.0.0)!
		rails-assets-perfect-scrollbar (= 0.6.12)!
		@@ -1019,21 +1018,20 @@ DEPENDENCIES
		rb-fsevent (= 0.9.7)
		rb-inotify (= 0.9.7)
		redcarpet (= 3.3.4)
		remotipart (= 1.2.1)
		responders (= 2.2.0)
		rspec-rails (= 3.5.1)
		responders (= 2.3.0)
		rspec-rails (= 3.5.2)
		rubocop (= 0.40.0)
		ruby-oembed (= 0.10.1)
		rubyzip (= 1.2.0)
		sass-rails (= 5.0.6)
		secure_headers (= 3.5.0)
		shoulda-matchers (= 3.1.1)
		sidekiq (= 4.1.4)
		sidekiq-cron (= 0.4.2)
		sidekiq (= 4.2.2)
		sidekiq-cron (= 0.4.4)
		simple_captcha2 (= 0.4.0)
		simplecov (= 0.12.0)
		sinatra (= 1.4.7)
		sinon-rails (= 1.15.0)
		spring (= 1.7.2)
		spring (= 2.0.0)
		spring-commands-cucumber (= 1.0.1)
		spring-commands-rspec (= 1.0.4)
		test_after_commit (= 1.1.0)
		@@ -1042,13 +1040,13 @@ DEPENDENCIES
		twitter (= 5.16.0)
		twitter-text (= 1.14.0)
		typhoeus (= 1.1.0)
		uglifier (= 3.0.1)
		uglifier (= 3.0.2)
		unicorn (= 5.1.0)
		unicorn-worker-killer (= 0.4.4)
		uuid (= 2.3.8)
		versionist (= 1.5.0)
		webmock (= 2.1.0)
		will_paginate (= 3.1.0)
		will_paginate (= 3.1.5)

		BUNDLED WITH
		1.12.5
		1.13.5

GNU-AGPL-3.0→LICENSE

+0 −0

File moved.

View file

app/assets/images/branding/logos/logo.png

deleted100644 → 0

−4.06 KiB

Loading image diff...