Merge branch 'release/0.7.2.0'

updated 32 locale files [ci skip]
Remove aspect_ids parameter from publisher
2026-04-29 03:01:03 -04:00 · 2017-12-26 03:36:49 +01:00 · 2017-12-26 03:30:32 +01:00 · 2017-12-25 20:54:10 +01:00 · 2017-12-25 20:54:05 +01:00 · 2017-12-24 02:50:19 +01:00
1876 changed files with 74461 additions and 64557 deletions
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -0,0 +1,36 @@
+---
+engines:
+  brakeman:
+    enabled: true
+  bundler-audit:
+    enabled: true
+  csslint:
+    enabled: true
+  duplication:
+    enabled: true
+    config:
+      languages:
+      - ruby
+      - javascript
+  eslint:
+    enabled: true
+    channel: "eslint-2"
+  fixme:
+    enabled: true
+  rubocop:
+    enabled: true
+ratings:
+  paths:
+  - Gemfile.lock
+  - "**.erb"
+  - "**.haml"
+  - "**.rb"
+  - "**.css"
+  - "**.js"
+exclude_paths:
+- config/
+- db/
+- features/
+- script/
+- spec/
+- vendor/
--- a/.eslintrc
+++ b/.eslintrc
@@ -0,0 +1,258 @@
+{
+  "env": {
+    "browser": true,
+    "jasmine": true,
+    "jquery": true
+  },
+
+  "globals": {
+    "_": false,
+    "autosize": false,
+    "Backbone": false,
+    "Bloodhound": false,
+    "gon": false,
+    "Handlebars": false,
+    "HandlebarsTemplates": false,
+    "ImagePaths": false,
+    "jsxc": false,
+    "L": false,
+    "Routes": false,
+    "OSM": false,
+    "qq": false,
+    "blueimp": false,
+
+    "loginAs": true,
+    "logout": true,
+    "spec": true,
+    "context": true,
+    "factory": true,
+    "stubView": true,
+
+    "app": true,
+    "Diaspora": true,
+    "Keycodes": true,
+    "PosixBracketExpressions": true
+  },
+
+  "rules": {
+    "accessor-pairs": 0,
+    "array-bracket-spacing": [2, "never"],
+    "array-callback-return": 0,
+    "arrow-body-style": 0,
+    "arrow-parens": 0,
+    "arrow-spacing": 0,
+    "block-scoped-var": 0,
+    "block-spacing": [2, "always"],
+    "brace-style": [2, "1tbs", {"allowSingleLine": true}],
+    "callback-return": 0,
+    "camelcase": 2,
+    "comma-dangle": [2, "never"],
+    "comma-spacing": [2, {"before": false, "after": true}],
+    "comma-style": [2, "last"],
+    "complexity": [1, {"max": 20}],
+    "computed-property-spacing": [2, "never"],
+    "consistent-return": 2,
+    "consistent-this": 0,
+    "constructor-super": 0,
+    "curly": [2, "all"],
+    "default-case": 0,
+    "dot-location": [2, "property"],
+    "dot-notation": 2,
+    "eol-last": 2,
+    "eqeqeq": [2, "allow-null"],
+    "func-names": 0,
+    "func-style": 0,
+    "generator-star-spacing": 0,
+    "global-require": 0,
+    "guard-for-in": 1,
+    "handle-callback-err": 0,
+    "id-blacklist": 0,
+    "id-length": 0,
+    "id-match": 0,
+    "indent": [2, 2, {"SwitchCase": 1, "VariableDeclarator": {"var": 2, "let": 2, "const": 3}}],
+    "init-declarations": 0,
+    "jsx-quotes": 0,
+    "key-spacing": [2, {"beforeColon": false, "afterColon": true}],
+    "keyword-spacing": 2,
+    "linebreak-style": 0,
+    "lines-around-comment": 0,
+    "max-depth": 0,
+    "max-len": [1, {"code": 120, "ignoreUrls": true}],
+    "max-lines": 0,
+    "max-nested-callbacks": 0,
+    "max-params": 0,
+    "max-statements": 0,
+    "max-statements-per-line": 0,
+    "new-cap": [2, {"capIsNew": false}],
+    "new-parens": 2,
+    "newline-after-var": 0,
+    "newline-before-return": 0,
+    "newline-per-chained-call": 0,
+    "no-alert": 0,
+    "no-array-constructor": 2,
+    "no-bitwise": 0,
+    "no-caller": 2,
+    "no-case-declarations": 2,
+    "no-catch-shadow": 0,
+    "no-class-assign": 2,
+    "no-cond-assign": 2,
+    "no-confusing-arrow": 2,
+    "no-console": 2,
+    "no-const-assign": 2,
+    "no-constant-condition": 2,
+    "no-continue": 0,
+    "no-control-regex": 2,
+    "no-debugger": 2,
+    "no-delete-var": 2,
+    "no-div-regex": 0,
+    "no-dupe-args": 2,
+    "no-dupe-class-members": 2,
+    "no-dupe-keys": 2,
+    "no-duplicate-case": 2,
+    "no-duplicate-imports": 0,
+    "no-else-return": 2,
+    "no-empty": 2,
+    "no-empty-character-class": 2,
+    "no-empty-function": 1,
+    "no-empty-pattern": 2,
+    "no-eq-null": 0,
+    "no-eval": 2,
+    "no-ex-assign": 2,
+    "no-extend-native": 2,
+    "no-extra-bind": 2,
+    "no-extra-boolean-cast": 2,
+    "no-extra-label": 0,
+    "no-extra-parens": 0,
+    "no-extra-semi": 2,
+    "no-fallthrough": 2,
+    "no-floating-decimal": 0,
+    "no-func-assign": 2,
+    "no-implicit-coercion": 0,
+    "no-implicit-globals": 0,
+    "no-implied-eval": 0,
+    "no-inline-comments": 0,
+    "no-inner-declarations": 2,
+    "no-invalid-regexp": 2,
+    "no-invalid-this": 0,
+    "no-irregular-whitespace": 2,
+    "no-iterator": 0,
+    "no-label-var": 0,
+    "no-labels": 0,
+    "no-lone-blocks": 0,
+    "no-lonely-if": 2,
+    "no-loop-func": 2,
+    "no-magic-numbers": 0,
+    "no-mixed-operators": 0,
+    "no-mixed-requires": 0,
+    "no-mixed-spaces-and-tabs": 2,
+    "no-multi-spaces": 1,
+    "no-multi-str": 0,
+    "no-multiple-empty-lines": [1, {"max": 1}],
+    "no-native-reassign": 2,
+    "no-negated-condition": 0,
+    "no-negated-in-lhs": 2,
+    "no-nested-ternary": 0,
+    "no-new": 0,
+    "no-new-func": 0,
+    "no-new-object": 0,
+    "no-new-require": 0,
+    "no-new-symbol": 0,
+    "no-new-wrappers": 0,
+    "no-obj-calls": 2,
+    "no-octal": 2,
+    "no-octal-escape": 0,
+    "no-param-reassign": 0,
+    "no-path-concat": 0,
+    "no-plusplus": 0,
+    "no-process-env": 0,
+    "no-process-exit": 0,
+    "no-proto": 2,
+    "no-prototype-builtins": 0,
+    "no-redeclare": 2,
+    "no-regex-spaces": 2,
+    "no-restricted-globals": 0,
+    "no-restricted-imports": 0,
+    "no-restricted-modules": 0,
+    "no-restricted-syntax": 0,
+    "no-return-assign": 2,
+    "no-script-url": 0,
+    "no-self-assign": 2,
+    "no-self-compare": 2,
+    "no-sequences": 2,
+    "no-shadow": 1,
+    "no-shadow-restricted-names": 2,
+    "no-spaced-func": 1,
+    "no-sparse-arrays": 2,
+    "no-sync": 0,
+    "no-ternary": 0,
+    "no-this-before-super": 2,
+    "no-throw-literal": 2,
+    "no-trailing-spaces": 2,
+    "no-undef": 2,
+    "no-undef-init": 0,
+    "no-undefined": 0,
+    "no-underscore-dangle": 0,
+    "no-unexpected-multiline": 2,
+    "no-unmodified-loop-condition": 1,
+    "no-unneeded-ternary": 1,
+    "no-unreachable": 2,
+    "no-unsafe-finally": 1,
+    "no-unused-expressions": 0,
+    "no-unused-labels": 2,
+    "no-unused-vars": 2,
+    "no-use-before-define": [2, {"functions": false, "classes": true}],
+    "no-useless-call": 1,
+    "no-useless-computed-key": 0,
+    "no-useless-concat": 0,
+    "no-useless-constructor": 0,
+    "no-useless-escape": 0,
+    "no-useless-rename": 0,
+    "no-var": 0,
+    "no-void": 0,
+    "no-warning-comments": 0,
+    "no-whitespace-before-property": 2,
+    "no-with": 2,
+    "object-curly-newline": 0,
+    "object-curly-spacing": [2, "never"],
+    "object-property-newline": 0,
+    "object-shorthand": 0,
+    "one-var": 0,
+    "one-var-declaration-per-line": 0,
+    "operator-assignment": 0,
+    "operator-linebreak": 0,
+    "padded-blocks": [2, "never"],
+    "prefer-arrow-callback": 0,
+    "prefer-const": 0,
+    "prefer-reflect": 0,
+    "prefer-rest-params": 0,
+    "prefer-spread": 0,
+    "prefer-template": 0,
+    "quote-props": 0,
+    "quotes": [2, "double", "avoid-escape"],
+    "radix": [2, "always"],
+    "require-jsdoc": 0,
+    "require-yield": 0,
+    "rest-spread-spacing": 0,
+    "semi": [2, "always"],
+    "semi-spacing": [2, {"before": false, "after": true}],
+    "sort-imports": 0,
+    "sort-vars": 0,
+    "space-before-blocks": [2, "always"],
+    "space-before-function-paren": [2, "never"],
+    "space-in-parens": [2, "never"],
+    "space-infix-ops": [2, {"int32Hint": true}],
+    "space-unary-ops": [2, {"words": true, "nonwords": false}],
+    "spaced-comment": [2, "always", {"markers": ["="]}],
+    "strict": 0,
+    "template-curly-spacing": 0,
+    "unicode-bom": 0,
+    "use-isnan": 2,
+    "valid-jsdoc": 0,
+    "valid-typeof": 2,
+    "vars-on-top": 0,
+    "wrap-iife": 0,
+    "wrap-regex": 0,
+    "yield-star-spacing": 0,
+    "yoda": [2, "never"]
+  }
+}
--- a/.gitignore
+++ b/.gitignore
@@ -1,35 +1,24 @@
-# xmpp certificates, keys and user data
-config/vines/*.crt
-config/vines/*.key
+# XMPP certificates, keys and user data
+config/certs/*.crt
+config/certs/*.key
+config/prosody.cfg.lua

-#trademark sillyness
+# Trademark sillyness
 app/views/home/_show.*
 app/views/terms/terms.*
 app/assets/images/custom/

-
 # Configuration files
 config/diaspora.yml
-config/heroku.yml
 config/initializers/secret_token.rb
-config/redis.conf
-config/deploy_config.yml
-config/schedule.rb
 .bundle
 vendor/bundle/
 vendor/cache/
 config/database.yml
-.rvmrc_custom
-.rvmrc.local
-
-#Mailing list stuff
-config/email_offset
-config/mailing_list.csv
+config/oidc_key.pem

 # Generated files
 log/
-public/stylesheets/*.css
-public/diaspora
 spec/fixtures/*.y*ml
 spec/fixtures/*.fixture.*
 coverage/
@@ -38,13 +27,19 @@ public/404.html
 public/422.html
 public/500.html

+# the db/schema.rb. Although this is contrary to rails best-practises, we
+# cannot provide a schema.rb that works for both MySQL and PostgreSQL, so we
+# have no choice. Our migrations are maintained, so it should always be
+# possible to get back to a "clean" database schema anyway.
+db/schema.rb
+
 # Sprites
 app/assets/images/branding-*.png
 app/assets/images/branding/logos-*.png
 app/assets/images/icons-*.png
-app/assets/images/social_media_logos-*.png
+app/assets/images/social-media-logos-*.png

-#Documentation
+# Documentation
 .yardoc/
 doc/

@@ -52,33 +47,34 @@ doc/
 public/uploads/
 public/assets/
 public/source.tar*
-public/.well-known
-tmp/**/
 tmp/
-*.sqlite3

 # Temporary files of every sort
 .sass-cache/
 .DS_Store
 .idea
 .redcar
-.rvmrc
 .stgit*
 *.swap
 *.swo
 *.swp
 *~
 *#
+*.bak
+*.save
+*.autosave
 nbproject
 patches-*
 capybara-*.html
-dump.rdb

-#Rubinius's JIT
+# Rubinius's JIT
 *.rbc

-#IDE
+# IDE
 diaspora.iml

 # Dolphin's directory's preferences files
 *.directory
+
+# WebTranslateIt
+.wti
--- a/.haml-lint.yml
+++ b/.haml-lint.yml
@@ -0,0 +1,5 @@
+linters:
+  LineLength:
+    max: 120
+  SpaceInsideHashAttributes:
+    style: no_space
--- a/.hound.yml
+++ b/.hound.yml
@@ -1,9 +0,0 @@
-java_script:
-  enabled: true
-  config_file: config/.jshint.json
-  ignore_file: config/.jshint_ignore
-ruby:
-  enabled: true
-  config_file: .rubocop.yml
-scss:
-  enabled: false
--- a/.jshintignore
+++ b/.jshintignore
@@ -1 +0,0 @@
-config/.jshint_ignore
--- a/.jshintrc
+++ b/.jshintrc
@@ -1 +0,0 @@
-config/.jshint.json
--- a/.pronto.yml
+++ b/.pronto.yml
@@ -0,0 +1,4 @@
+all:
+  exclude:
+    - "vendor/**/*"
+consolidate_comments: true
--- a/.rspec
+++ b/.rspec
@@ -3,3 +3,4 @@
 --color
 --tag ~performance
 --order random
+--require spec_helper
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,5 +1,15 @@
 AllCops:
-  RunRailsCops: true
+  TargetRubyVersion: 2.3
+  Exclude:
+    - "bin/**/*"
+    - "db/schema.rb"
+
+Rails:
+  Enabled: true
+
+# Disable for rails 4
+Rails/HttpPositionalArguments:
+  Enabled: false

 # Commonly used screens these days easily fit more than 80 characters.
 Metrics/LineLength:
@@ -13,10 +23,25 @@ Metrics/MethodLength:
 # The guiding principle of classes is SRP, SRP can't be accurately measured by LoC
 Metrics/ClassLength:
  Max: 1500
+Metrics/ModuleLength:
+  Max: 1500
+  
+# Raise AbcSize from 15 to 20
+Metrics/AbcSize:
+  Max: 20
+
+# Some blocks are longer.
+Metrics/BlockLength:
+  ExcludedMethods:
+    - "namespace"
+    - "create_table"
+  Exclude:
+    - "config/**/*.rb"
+    - "spec/**/*.rb"

 # No space makes the method definition shorter and differentiates
 # from a regular assignment.
-Style/SpaceAroundEqualsInParameterDefault:
+Layout/SpaceAroundEqualsInParameterDefault:
  EnforcedStyle: no_space

 # Single quotes being faster is hardly measurable and only affects parse time.
@@ -31,7 +56,7 @@ Style/SymbolArray:
  Enabled: true

 # Most readable form.
-Style/AlignHash:
+Layout/AlignHash:
  EnforcedHashRocketStyle: table
  EnforcedColonStyle: table

@@ -40,7 +65,7 @@ Style/HashSyntax:
 EnforcedStyle: ruby19_no_mixed_keys

 # has_key? and has_value? are far more readable than key? and value?
-Style/DeprecatedHashMethods:
+Style/PreferredHashMethods:
  Enabled: false

 # String#% is by far the least verbose and only object oriented variant.
@@ -68,7 +93,7 @@ Style/RaiseArgs:

 # Indenting the chained dots beneath each other is not supported by this cop,
 # see https://github.com/bbatsov/rubocop/issues/1633
-Style/MultilineOperationIndentation:
+Layout/MultilineOperationIndentation:
  Enabled: false

 # Fail is an alias of raise. Avoid aliases, it's more cognitive load for no gain.
@@ -83,7 +108,7 @@ Style/SignalException:
 Lint/HandleExceptions:
  Enabled: false

-Style/SpaceInsideBlockBraces:
+Layout/SpaceInsideBlockBraces:
  # The space here provides no real gain in readability while consuming
  # horizontal space that could be used for a better parameter name.
  # Also {| differentiates better from a hash than { | does.
@@ -91,7 +116,7 @@ Style/SpaceInsideBlockBraces:

 # No trailing space differentiates better from the block:
 # foo} means hash, foo } means block.
-Style/SpaceInsideHashLiteralBraces:
+Layout/SpaceInsideHashLiteralBraces:
  EnforcedStyle: no_space

 # { ... } for multi-line blocks is okay, follow Weirichs rule instead:
@@ -99,6 +124,11 @@ Style/SpaceInsideHashLiteralBraces:
 Style/BlockDelimiters:
  Enabled: false

+# Enforcing -> would be nice, but not at the cost of enforcing lambda { } for
+# multiline lambdas.
+Style/Lambda:
+  Enabled: false
+
 # do / end blocks should be used for side effects,
 # methods that run a block for side effects and have
 # a useful return value are rare, assign the return
@@ -123,7 +153,7 @@ Style/Documentation:
  Enabled: false 

 # This is just silly. Calling the argument `other` in all cases makes no sense.
-Style/OpMethod:
+Naming/BinaryOperatorParameterName:
  Enabled: false 

 # There are valid cases, for example debugging Cucumber steps,
@@ -131,7 +161,10 @@ Style/OpMethod:
 Lint/Debugger:
  Enabled: false

+# We used comparison everywhere.
+Style/NumericPredicate:
+  EnforcedStyle: comparison

 # Reset some HoundCI changes back to Rubocop defaults
-Style/DotPosition:
+Layout/DotPosition:
  EnforcedStyle: leading
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.1
+2.4
--- a/.scss-lint.yml
+++ b/.scss-lint.yml
@@ -0,0 +1,231 @@
+scss_files: 'app/assets/stylesheets/**/*.scss'
+plugin_directories: ['.scss-linters']
+
+# List of gem names to load custom linters from (make sure they are already
+# installed)
+plugin_gems: []
+
+linters:
+  BangFormat:
+    enabled: true
+    space_before_bang: true
+    space_after_bang: false
+
+  BemDepth:
+    enabled: false
+    max_elements: 1
+
+  BorderZero:
+    enabled: true
+    convention: zero # or `none`
+
+  ColorKeyword:
+    enabled: true
+
+  ColorVariable:
+    enabled: true
+
+  Comment:
+    enabled: true
+
+  DebugStatement:
+    enabled: true
+
+  DeclarationOrder:
+    enabled: true
+
+  DisableLinterReason:
+    enabled: true
+
+  DuplicateProperty:
+    enabled: true
+
+  ElsePlacement:
+    enabled: true
+    style: same_line # or 'new_line'
+
+  EmptyLineBetweenBlocks:
+    enabled: true
+    ignore_single_line_blocks: true
+
+  EmptyRule:
+    enabled: true
+
+  ExtendDirective:
+    enabled: false
+
+  FinalNewline:
+    enabled: true
+    present: true
+
+  HexLength:
+    enabled: true
+    style: short # or 'long'
+
+  HexNotation:
+    enabled: true
+    style: lowercase # or 'uppercase'
+
+  HexValidation:
+    enabled: true
+
+  IdSelector:
+    enabled: true
+
+  ImportantRule:
+    enabled: true
+
+  ImportPath:
+    enabled: true
+    leading_underscore: false
+    filename_extension: false
+
+  Indentation:
+    enabled: true
+    allow_non_nested_indentation: false
+    character: space # or 'tab'
+    width: 2
+
+  LeadingZero:
+    enabled: true
+    style: exclude_zero # or 'include_zero'
+
+  MergeableSelector:
+    enabled: true
+    force_nesting: true
+
+  NameFormat:
+    enabled: true
+    allow_leading_underscore: true
+    convention: hyphenated_lowercase # or 'camel_case', or 'snake_case', or a regex pattern
+
+  NestingDepth:
+    enabled: true
+    max_depth: 3
+    ignore_parent_selectors: false
+
+  PlaceholderInExtend:
+    enabled: true
+
+  PropertyCount:
+    enabled: false
+    include_nested: false
+    max_properties: 10
+
+  PropertySortOrder:
+    enabled: true
+    ignore_unspecified: false
+    min_properties: 2
+    separate_groups: false
+
+  PropertySpelling:
+    enabled: true
+    extra_properties: []
+
+  PropertyUnits:
+    enabled: true
+    global: [
+      'ch', 'em', 'ex', 'rem',                 # Font-relative lengths
+      'cm', 'in', 'mm', 'pc', 'pt', 'px', 'q', # Absolute lengths
+      'vh', 'vw', 'vmin', 'vmax',              # Viewport-percentage lengths
+      'deg', 'grad', 'rad', 'turn',            # Angle
+      'ms', 's',                               # Duration
+      'Hz', 'kHz',                             # Frequency
+      'dpi', 'dpcm', 'dppx',                   # Resolution
+      '%']                                     # Other
+    properties: {}
+
+  QualifyingElement:
+    enabled: true
+    allow_element_with_attribute: false
+    allow_element_with_class: false
+    allow_element_with_id: false
+
+  SelectorDepth:
+    enabled: true
+    max_depth: 3
+
+  SelectorFormat:
+    enabled: true
+    convention: hyphenated_lowercase # or 'strict_BEM', or 'hyphenated_BEM', or 'snake_case', or 'camel_case', or a regex pattern
+
+  Shorthand:
+    enabled: true
+    allowed_shorthands: [1, 2, 3]
+
+  SingleLinePerProperty:
+    enabled: true
+    allow_single_line_rule_sets: true
+
+  SingleLinePerSelector:
+    enabled: true
+
+  SpaceAfterComma:
+    enabled: true
+
+  SpaceAfterPropertyColon:
+    enabled: true
+    style: one_space # or 'no_space', or 'at_least_one_space', or 'aligned'
+
+  SpaceAfterPropertyName:
+    enabled: true
+
+  SpaceAfterVariableName:
+    enabled: true
+
+  SpaceAroundOperator:
+    enabled: true
+    style: one_space # or 'no_space'
+
+  SpaceBeforeBrace:
+    enabled: true
+    style: space # or 'new_line'
+    allow_single_line_padding: false
+
+  SpaceBetweenParens:
+    enabled: true
+    spaces: 0
+
+  StringQuotes:
+    enabled: true
+    style: single_quotes # or double_quotes
+
+  TrailingSemicolon:
+    enabled: true
+
+  TrailingWhitespace:
+    enabled: true
+
+  TrailingZero:
+    enabled: false
+
+  TransitionAll:
+    enabled: false
+
+  UnnecessaryMantissa:
+    enabled: true
+
+  UnnecessaryParentReference:
+    enabled: true
+
+  UrlFormat:
+    enabled: true
+
+  UrlQuotes:
+    enabled: true
+
+  VariableForProperty:
+    enabled: false
+    properties: []
+
+  VendorPrefix:
+    enabled: true
+    identifier_list: base
+    additional_identifiers: []
+    excluded_identifiers: []
+
+  ZeroUnit:
+    enabled: true
+
+  Compass::*:
+    enabled: false
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,33 +1,40 @@
 language: ruby

 rvm:
-  - 2.1
-  - 2.0
+  - 2.4.2
+  - 2.3.5

 env:
-  - DB=postgres BUILD_TYPE=other
-  - DB=mysql BUILD_TYPE=other
-  - DB=postgres BUILD_TYPE=cucumber
+  - DB=postgresql BUILD_TYPE=cucumber
  - DB=mysql BUILD_TYPE=cucumber
+  - DB=postgresql BUILD_TYPE=other
+  - DB=mysql BUILD_TYPE=other

 sudo: false
 cache:
  bundler: true
  directories:
    - app/assets/images
+    - tmp/cache/assets

 branches:
  only:
    - 'master'
-    - 'stable'
+    - 'next-minor'
    - 'develop'

-before_install: gem install bundler
-bundler_args: "--without development production heroku --jobs 3 --retry 3"
+before_install:
+  - script/ci/prepare.sh
+  - mkdir travis-phantomjs
+  - wget http://cifiles.diasporafoundation.org/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2
+  - tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs
+  - export PATH=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH

-script: "./script/ci/build.sh"
+script: "bin/rake --trace ci:travis:${BUILD_TYPE}"

 notifications:
  irc:
    channels:
-      - "irc.freenode.org:6667#diaspora-dev"
+      - secure: YvYkeTAw+5oOl/RaXVwu7JkKGNWPoFosNQRmLvJkBFbWzZ1s5LZD1u3+Qj819bT3lGzJu9pxmJg765IRYrGWmBi4mcAV3dpO6qowVdFTcorf0JsnLw3Kvkga9rrDunsRNr21KTAQqHOO5mKUzw9DtMzd52BiWuZwIj3xcl72gQI=
+    template:
+      - "%{repository_slug}#%{commit} (%{branch} - %{commit_subject}): %{message} %{build_url}"
--- a/16
+++ b/16
@@ -1,11 +1,7 @@
-Diaspora is written by:
-  Daniel Grippi
-  Ilya Zhitomirskiy
-  Maxwell Salzberg
-  Raphael Sofaer
+diaspora* was initially developed by:
+-  Ilya Zhitomirskiy
+-  Raphael Sofaer
+-  Daniel Grippi
+-  Maxwell Salzberg

-With help from many libraries and frameworks including:
-  JQuery
-  Ruby on Rails
-  Blueprint-CSS
-  and others
+It lives on as an open source project with many contributors, a self updating list is at: https://github.com/diaspora/diaspora/graphs/contributors
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at [team@diasporafoundation.org](mailto:team@diasporafoundation.org). All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -0,0 +1,42 @@
+# Contributing to diaspora\*
+
+First of all: thank you very much for helping us out!
+
+## Things you need to know before contributing
+
+If you want to get in touch with other diaspora\* developers, [check our wiki][how-we-communicate] for information on how we communicate. Feel free to ask if you have any questions!
+
+Everyone interacting with our code, issue trackers, chat rooms, mailing lists, the wiki, and the discourse forum is expected to follow the [diaspora\* code of conduct][code-of-conduct].
+
+## Report a security issue
+
+Found a security issue? Please disclose it responsibly. We have a team of developers listening to [security@diasporafoundation.org][sec-mail]. The PGP fingerprint is [AB0D AB02 0FC5 D398 03AB 3CE1 6F70 243F 27AD 886A][pgp].
+
+## Contributing to translations
+
+We use [WebTranslateIt][webtranslateit] to manage translations of the app interface. Please read [our wiki page][translation-wiki] to find out more about this. If your language is featured on WebTranslateIt, please do **not** open a pull request to update translations. If it is not already featured on WebTranslateIt, please read the wiki article above to find out how to proceed.
+
+## Contributing to the code
+
+**Before opening a pull request** please read [how to contribute][contribute]. Doing things the right way from the start will save us time and mean that your contribution can be integrated quicker!
+- Follow our [git workflow][git-workflow] method. In particular, *do not* open a pull request from the `master` or the `develop` branch.
+- Follow our [styleguide][styleguide] and run pronto, our syntax analyzer, **locally before opening a pull request**. See [our wiki][pronto] for information on how to do this.
+- [Write tests][testing-workflow].
+- Use meaningful commit-messages and split larger tasks, e.g. refactoring, into separate commits. This makes the review process much easier.
+
+## Other ways to contribute
+
+You don’t know code? No worries, there are plenty other ways to help the diaspora* project! Please find out how you can help [on our wiki][other-ways].
+
+[code-of-conduct]: https://github.com/diaspora/diaspora/blob/develop/CODE_OF_CONDUCT.md
+[how-we-communicate]: https://wiki.diasporafoundation.org/How_we_communicate
+[pgp]: https://pgp.mit.edu/pks/lookup?op=get&search=0x6F70243F27AD886A
+[sec-mail]: mailto:security@diasporafoundation.org
+[webtranslateit]: https://webtranslateit.com/en/projects/3020-Diaspora
+[translation-wiki]: https://wiki.diasporafoundation.org/Contribute_translations
+[contribute]: https://wiki.diasporafoundation.org/Getting_started_with_contributing
+[git-workflow]: https://wiki.diasporafoundation.org/Git_Workflow
+[styleguide]: https://wiki.diasporafoundation.org/Styleguide
+[pronto]: https://wiki.diasporafoundation.org/Styleguide#Automatic_local_review
+[testing-workflow]: https://wiki.diasporafoundation.org/Testing_Workflow
+[other-ways]: https://wiki.diasporafoundation.org/Other_ways_to_contribute
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,748 @@
+# 0.7.2.0
+
+## Bug fixes
+* Ignore invalid `diaspora://` links [#7652](https://github.com/diaspora/diaspora/pull/7652)
+* Fix deformed avatar in hovercards [#7656](https://github.com/diaspora/diaspora/pull/7656)
+* Fix default aspects on profile page and bookmarklet publisher [#7679](https://github.com/diaspora/diaspora/issues/7679)
+
+## Features
+* Add birthday notifications [#7624](https://github.com/diaspora/diaspora/pull/7624)
+
+# 0.7.1.1
+
+Fixes an issue with installing and running diaspora\* with today released bundler v1.16.0.
+
+# 0.7.1.0
+
+## Ensure account deletions are run
+
+There were some issues causing accounts deletions to not properly perform in some cases, see
+[#7631](https://github.com/diaspora/diaspora/issues/7631) and [#7639](https://github.com/diaspora/diaspora/pull/7639).
+To ensure these are reexecuted properly, please run `RAILS_ENV=production bin/rake migrations:run_account_deletions`
+after you've upgraded.
+
+## Refactor
+* Remove title from profile photo upload button [#7551](https://github.com/diaspora/diaspora/pull/7551)
+* Remove Internet Explorer workarounds [#7557](https://github.com/diaspora/diaspora/pull/7557)
+* Sort notifications by last interaction [#7568](https://github.com/diaspora/diaspora/pull/7568) [#7648](https://github.com/diaspora/diaspora/pull/7648)
+* Remove tiff support from photos [#7576](https://github.com/diaspora/diaspora/pull/7576)
+* Remove reference from reshares when original post is deleted [#7578](https://github.com/diaspora/diaspora/pull/7578)
+* Merge migrations from before 0.6.0.0 to CreateSchema [#7580](https://github.com/diaspora/diaspora/pull/7580)
+* Remove auto detection of languages with highlightjs [#7591](https://github.com/diaspora/diaspora/pull/7591)
+* Move enable/disable notification icon [#7592](https://github.com/diaspora/diaspora/pull/7592)
+* Use Bootstrap 3 progress-bar for polls [#7600](https://github.com/diaspora/diaspora/pull/7600)
+* Enable frozen string literals [#7595](https://github.com/diaspora/diaspora/pull/7595)
+* Remove `rails_admin_histories` table [#7597](https://github.com/diaspora/diaspora/pull/7597)
+* Optimize memory usage on profile export [#7627](https://github.com/diaspora/diaspora/pull/7627)
+* Limit the number of parallel exports [#7629](https://github.com/diaspora/diaspora/pull/7629)
+* Reduce memory usage for account deletion [#7639](https://github.com/diaspora/diaspora/pull/7639)
+
+## Bug fixes
+* Fix displaying polls with long answers [#7579](https://github.com/diaspora/diaspora/pull/7579)
+* Fix S3 support [#7566](https://github.com/diaspora/diaspora/pull/7566)
+* Fix mixed username and timestamp with LTR/RTL scripts [#7575](https://github.com/diaspora/diaspora/pull/7575)
+* Prevent users from zooming in IE Mobile [#7589](https://github.com/diaspora/diaspora/pull/7589)
+* Fix recipient prefill on contacts and profile page [#7599](https://github.com/diaspora/diaspora/pull/7599)
+* Display likes and reshares without login [#7583](https://github.com/diaspora/diaspora/pull/7583)
+* Fix invalid data in the database for user data export [#7614](https://github.com/diaspora/diaspora/pull/7614)
+* Fix local migration run without old private key [#7558](https://github.com/diaspora/diaspora/pull/7558)
+* Fix export not downloadable because the filename was resetted on access [#7622](https://github.com/diaspora/diaspora/pull/7622)
+* Delete invalid oEmbed caches with binary titles [#7620](https://github.com/diaspora/diaspora/pull/7620)
+* Delete invalid diaspora IDs from friendica [#7630](https://github.com/diaspora/diaspora/pull/7630)
+* Cleanup relayables where the signature is missing [#7637](https://github.com/diaspora/diaspora/pull/7637)
+* Avoid page to jump to top after a post deletion [#7638](https://github.com/diaspora/diaspora/pull/7638)
+* Handle duplicate account deletions [#7639](https://github.com/diaspora/diaspora/pull/7639)
+* Handle duplicate account migrations [#7641](https://github.com/diaspora/diaspora/pull/7641)
+* Handle bugs related to missing users [#7632](https://github.com/diaspora/diaspora/pull/7632)
+* Cleanup empty signatures [#7644](https://github.com/diaspora/diaspora/pull/7644)
+
+## Features
+* Ask for confirmation when leaving a submittable comment field [#7530](https://github.com/diaspora/diaspora/pull/7530)
+* Show users vote in polls [#7550](https://github.com/diaspora/diaspora/pull/7550)
+* Add explanation of ignore function to in-app help section [#7585](https://github.com/diaspora/diaspora/pull/7585)
+* Add camo information to NodeInfo [#7617](https://github.com/diaspora/diaspora/pull/7617)
+* Add support for `diaspora://` links [#7625](https://github.com/diaspora/diaspora/pull/7625)
+* Add support to relay likes for comments [#7625](https://github.com/diaspora/diaspora/pull/7625)
+* Implement RFC 7033 WebFinger [#7625](https://github.com/diaspora/diaspora/pull/7625)
+
+# 0.7.0.1
+
+Update nokogiri to fix [multiple libxml2 vulnerabilities](https://usn.ubuntu.com/usn/usn-3424-1/).
+
+# 0.7.0.0
+
+## Supported Ruby versions
+
+This release recommends using Ruby 2.4, while retaining Ruby 2.3 as an officially supported version.
+Ruby 2.1 is no longer officially supported.
+
+## Delete public/.well-known/
+
+Before upgrading, please check if your `public/` folder contains a hidden `.well-known/` folder.
+If so, please delete it since it will prevent the federation from working properly.
+
+## Refactor
+
+* Make the mention syntax more flexible [#7305](https://github.com/diaspora/diaspora/pull/7305)
+* Display @ before mentions [#7324](https://github.com/diaspora/diaspora/pull/7324)
+* Simplify mentions in the publisher [#7302](https://github.com/diaspora/diaspora/pull/7302)
+* Remove chartbeat and mixpanel support [#7280](https://github.com/diaspora/diaspora/pull/7280)
+* Upgrade to jQuery 3 [#7303](https://github.com/diaspora/diaspora/pull/7303)
+* Add i18n for color themes [#7369](https://github.com/diaspora/diaspora/pull/7369)
+* Remove deprecated statistics.json [#7399](https://github.com/diaspora/diaspora/pull/7399)
+* Always link comment count text on mobile [#7483](https://github.com/diaspora/diaspora/pull/7483)
+* Switch to new federation protocol [#7436](https://github.com/diaspora/diaspora/pull/7436)
+* Send public profiles publicly [#7501](https://github.com/diaspora/diaspora/pull/7501)
+* Change sender for mails [#7495](https://github.com/diaspora/diaspora/pull/7495)
+* Move back to top to the right to avoid misclicks [#7516](https://github.com/diaspora/diaspora/pull/7516)
+* Include count in mobile post action link [#7520](https://github.com/diaspora/diaspora/pull/7520)
+* Update the user data export archive format [#6726](https://github.com/diaspora/diaspora/pull/6726)
+* Use id as fallback when sorting posts [#7523](https://github.com/diaspora/diaspora/pull/7523)
+* Remove no-posts-info when adding posts to the stream [#7523](https://github.com/diaspora/diaspora/pull/7523)
+* Upgrade to rails 5.1 [#7514](https://github.com/diaspora/diaspora/pull/7514)
+* Refactoring single post view interactions [#7182](https://github.com/diaspora/diaspora/pull/7182)
+* Update help pages [#7528](https://github.com/diaspora/diaspora/pull/7528)
+* Disable rendering logging in production [#7529](https://github.com/diaspora/diaspora/pull/7529)
+* Add some missing indexes and cleanup the database if needed [#7533](https://github.com/diaspora/diaspora/pull/7533)
+* Remove avatar, name, timestamp and interactions from publisher preview [#7536](https://github.com/diaspora/diaspora/pull/7536)
+
+## Bug fixes
+
+* Fix height too high on mobile SPV [#7480](https://github.com/diaspora/diaspora/pull/7480)
+* Improve stream when ignoring a person who posts a lot of tagged posts [#7503](https://github.com/diaspora/diaspora/pull/7503)
+* Fix order of comments across pods [#7436](https://github.com/diaspora/diaspora/pull/7436)
+* Prevent publisher from closing in preview mode [#7518](https://github.com/diaspora/diaspora/pull/7518)
+* Increase reshare counter after reshare on mobile [#7520](https://github.com/diaspora/diaspora/pull/7520)
+* Reset stuck exports and handle errors [#7535](https://github.com/diaspora/diaspora/pull/7535)
+
+## Features
+* Add support for mentions in comments to the backend [#6818](https://github.com/diaspora/diaspora/pull/6818)
+* Add support for new mention syntax [#7300](https://github.com/diaspora/diaspora/pull/7300) [#7394](https://github.com/diaspora/diaspora/pull/7394)
+* Render mentions as links in comments [#7327](https://github.com/diaspora/diaspora/pull/7327)
+* Add support for mentions in comments to the front-end [#7386](https://github.com/diaspora/diaspora/pull/7386)
+* Support direct links to comments on mobile [#7508](https://github.com/diaspora/diaspora/pull/7508)
+* Add inviter first and last name in the invitation e-mail [#7484](https://github.com/diaspora/diaspora/pull/7484)
+* Add markdown editor for comments and conversations [#7482](https://github.com/diaspora/diaspora/pull/7482)
+* Improve responsive header in desktop version [#7509](https://github.com/diaspora/diaspora/pull/7509)
+* Support cmd+enter to submit posts, comments and conversations [#7524](https://github.com/diaspora/diaspora/pull/7524)
+* Add markdown editor for posts, comments and conversations on mobile [#7235](https://github.com/diaspora/diaspora/pull/7235)
+* Mark as "Mobile Web App Capable" on Android [#7534](https://github.com/diaspora/diaspora/pull/7534)
+* Add support for receiving account migrations [#6750](https://github.com/diaspora/diaspora/pull/6750)
+
+# 0.6.7.0
+
+## Refactor
+* Cleanup some translations [#7465](https://github.com/diaspora/diaspora/pull/7465)
+
+## Features
+* Change email without confirmation when mail is disabled [#7455](https://github.com/diaspora/diaspora/pull/7455)
+* Warn users if they leave the profile editing page with unsaved changes [#7473](https://github.com/diaspora/diaspora/pull/7473)
+* Add admin pages to the mobile interface [#7295](https://github.com/diaspora/diaspora/pull/7295)
+* Add links to discourse to footer and sidebar [#7446](https://github.com/diaspora/diaspora/pull/7446)
+
+# 0.6.6.0
+
+## Refactor
+* Remove rails\_admin [#7440](https://github.com/diaspora/diaspora/pull/7440)
+* Use guid instead of id at permalink and in SPV [#7453](https://github.com/diaspora/diaspora/pull/7453)
+
+## Bug fixes
+* Make photo upload button hover text translatable [#7429](https://github.com/diaspora/diaspora/pull/7429)
+* Fix first comment in mobile view with french locale [#7441](https://github.com/diaspora/diaspora/pull/7441)
+* Use post page title and post author in atom feed [#7420](https://github.com/diaspora/diaspora/pull/7420)
+* Handle broken public keys when receiving posts [#7448](https://github.com/diaspora/diaspora/pull/7448)
+* Fix welcome message when podmin is set to an invalid username [#7452](https://github.com/diaspora/diaspora/pull/7452)
+
+## Features
+* Add support for Nodeinfo 2.0 [#7447](https://github.com/diaspora/diaspora/pull/7447)
+
+# 0.6.5.0
+
+## Refactor
+* Remove unused setPreload function [#7354](https://github.com/diaspora/diaspora/pull/7354)
+* Remove jQuery deprecations [#7356](https://github.com/diaspora/diaspora/pull/7356)
+* Use empty selector where "#" was used as a selector before (prepare jQuery 3 upgrade) [#7372](https://github.com/diaspora/diaspora/pull/7372)
+* Increase maximal height of large thumbnail on mobile [#7383](https://github.com/diaspora/diaspora/pull/7383)
+* Reduce conversation recipient size [#7376](https://github.com/diaspora/diaspora/pull/7376)
+* Cleanup rtl css [#7374](https://github.com/diaspora/diaspora/pull/7374)
+* Increase visual spacing between list items [#7401](https://github.com/diaspora/diaspora/pull/7401)
+* Remove unused gem and cucumber step [#7410](https://github.com/diaspora/diaspora/pull/7410)
+* Disable CSP header when `report_only` and no `report_uri` is set [#7367](https://github.com/diaspora/diaspora/pull/7367)
+
+## Bug fixes
+* Don't hide posts when blocking someone from the profile [#7379](https://github.com/diaspora/diaspora/pull/7379)
+* Disable autocomplete for the conversation form recipient input [#7375](https://github.com/diaspora/diaspora/pull/7375)
+* Fix sharing indicator on profile page for blocked users [#7382](https://github.com/diaspora/diaspora/pull/7382)
+* Remove post only after a successful deletion on the server [#7385](https://github.com/diaspora/diaspora/pull/7385)
+* Fix an issue where pod admins could get logged out when using sidekiq-web [#7395](https://github.com/diaspora/diaspora/pull/7395)
+* Add avatar fallback for typeahead and conversations [#7414](https://github.com/diaspora/diaspora/pull/7414)
+
+## Features
+* Add links to liked and commented pages [#5502](https://github.com/diaspora/diaspora/pull/5502)
+
+# 0.6.4.1
+
+Fixes a possible Remote Code Execution ([CVE-2016-4658](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-4658)) and a possible DoS ([CVE-2016-5131](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-5131)) by updating Nokogiri, which in turn updates libxml2.
+
+# 0.6.4.0
+
+## Refactor
+* Unify link colors [#7318](https://github.com/diaspora/diaspora/pull/7318)
+* Increase time to wait before showing the hovercard [#7319](https://github.com/diaspora/diaspora/pull/7319)
+* Remove some unused color-theme overrides [#7325](https://github.com/diaspora/diaspora/pull/7325)
+* Change color of author-name on hover [#7326](https://github.com/diaspora/diaspora/pull/7326)
+* Add like and reshare services [#7337](https://github.com/diaspora/diaspora/pull/7337)
+
+## Bug fixes
+* Fix path to `bundle` in `script/server` [#7281](https://github.com/diaspora/diaspora/pull/7281)
+* Update comment in database example config [#7282](https://github.com/diaspora/diaspora/pull/7282)
+* Make the \#newhere post public again [#7311](https://github.com/diaspora/diaspora/pull/7311)
+* Remove whitespace from author link [#7330](https://github.com/diaspora/diaspora/pull/7330)
+* Fix autosize in modals [#7339](https://github.com/diaspora/diaspora/pull/7339)
+* Only display invite link on contacts page if invitations are enabled [#7342](https://github.com/diaspora/diaspora/pull/7342)
+* Fix regex for hashtags for some languages [#7350](https://github.com/diaspora/diaspora/pull/7350)
+* Create asterisk.png without digest after precompile [#7322](https://github.com/diaspora/diaspora/pull/7322)
+
+## Features
+* Add support for [Liberapay](https://liberapay.com) donations [#7290](https://github.com/diaspora/diaspora/pull/7290)
+* Added a link to the community guidelines :) [#7298](https://github.com/diaspora/diaspora/pull/7298)
+
+# 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.
+
+# 0.6.0.0
+
+## Warning: This release contains long migrations
+
+This diaspora\* releases comes with a few database cleanup migrations and they could possible take a while. While you should always do that, it is especially important this time to make sure you run the migrations inside a detachable environment like `screen` or `tmux`. A interrupted SSH session could possibly harm your database. Also, please make a backup.
+
+## The DB environment variable is gone
+
+With Bundler 1.10 supporting optional groups, we removed the DB environment variable. When updating to this release, please update
+bundler and select the database support you want:
+
+```sh
+gem install bundler
+bundle install --with mysql # For MySQL and MariaDB
+bundle install --with postgresql # For PostgreSQL
+```
+
+For production setups we now additionally recommend adding the `--deployment` flag.
+If you set the DB environment variable anywhere, that's no longer necessary.
+
+## Supported Ruby versions
+
+This release recommends using Ruby 2.3, while retaining Ruby 2.1 as an officially supported version.
+Ruby 2.0 is no longer officially supported.
+
+## Configuration changes
+
+Please note that the default listen parameter for production setups got
+changed. diaspora\* will no longer listen on `0.0.0.0:3000` as it will now
+bind to an UNIX socket at `unix:tmp/diaspora.sock`. Please change your local
+`diaspora.yml` if necessary.
+
+## Redis namespace support dropped
+
+We dropped support for Redis namespaces in this release. If you previously set
+a custom namespace, please note that diaspora\* will no longer use the
+configured value. By default, Redis supports up to 8 databases which can be
+selected via the Redis URL in `diaspora.yml`. Please check the examples
+provided in our configuration example file.
+
+## Terms of Use design changes
+
+With the port to Bootstrap 3, app/views/terms/default.haml has a new structure. If you have created a customised app/views/terms/terms.haml or app/views/terms/terms.erb file, you will need to edit those files to base your customisations on the new default.haml file.
+
+## API authentication
+
+This release makes diaspora\* a OpenID Connect provider. This means you can authenticate to third parties with your diaspora\* account and let
+them act as your diaspora\* account on your behalf. This feature is still considered in early development, we still expect edge cases and advanced
+features of the specificiation to not be handled correctly or be missing. But we expect a basic OpenID Connect compliant client to work. Please submit issues!
+We will also most likely still change the authorization scopes we offer and started with a very minimal set.
+Most work still required is on documentation as well as designing and implementing the data API for all of Diaspora's functionality.
+Contributions are very welcome, the hard work is done!
+
+## Vines got replaced by Prosody
+
+Due to many issues with Vines, we decided to remove Vines and offer a Prosody
+example configuration instead. [Check the
+wiki](https://wiki.diasporafoundation.org/Integration/Chat#Vines_to_Prosody)
+for more information on how to migrate to Prosody if you've been using Vines
+before.
+
+## Sidekiq queue changes
+
+We've decreased the amount of sidekiq queues from 13 to 5 in PR [#6950](https://github.com/diaspora/diaspora/pull/6950).
+The new queues are organized according to priority for the jobs they will process. When upgrading please make sure to
+empty the sidekiq queues before shutting down the server for an update.
+
+If you run your sidekiq with a custom queue configuration, please make sure to update that for the new queues.
+
+The new queues are: `urgent, high, medium, low, default`.
+
+When you upgrade to the new version, some jobs may persist in the old queues. To move them to the default queue,
+so they're processed, run:
+
+```
+bin/rake migrations:legacy_queues
+```
+
+Note that this will retry all dead jobs, if you want to prevent that empty the dead queue first.
+
+The command will report queues that still have jobs and launch sidekiq process for that queues.
+
+## Refactor
+* Improve bookmarklet [#5904](https://github.com/diaspora/diaspora/pull/5904)
+* Update listen configuration to listen on unix sockets by default [#5974](https://github.com/diaspora/diaspora/pull/5974)
+* Port to Bootstrap 3 [#6015](https://github.com/diaspora/diaspora/pull/6015)
+* Use a fixed width for the mobile drawer [#6057](https://github.com/diaspora/diaspora/pull/6057)
+* Replace jquery.autoresize with autosize [#6104](https://github.com/diaspora/diaspora/pull/6104)
+* Improve mobile conversation design [#6087](https://github.com/diaspora/diaspora/pull/6087)
+* Replace remaining faceboxes with Bootstrap modals [#6106](https://github.com/diaspora/diaspora/pull/6106) [#6161](https://github.com/diaspora/diaspora/pull/6161)
+* Rewrite header using Bootstrap 3 [#6109](https://github.com/diaspora/diaspora/pull/6109) [#6130](https://github.com/diaspora/diaspora/pull/6130) [#6132](https://github.com/diaspora/diaspora/pull/6132)
+* Use upstream CSS mappings for Entypo [#6158](https://github.com/diaspora/diaspora/pull/6158)
+* Replace some mobile icons with Entypo [#6218](https://github.com/diaspora/diaspora/pull/6218)
+* Refactor publisher backbone view [#6228](https://github.com/diaspora/diaspora/pull/6228)
+* Replace MBP.autogrow with autosize on mobile [#6261](https://github.com/diaspora/diaspora/pull/6261)
+* Improve mobile drawer transition [#6233](https://github.com/diaspora/diaspora/pull/6233)
+* Remove unused header icons and an unused favicon  [#6283](https://github.com/diaspora/diaspora/pull/6283)
+* Replace mobile icons for post interactions with Entypo icons [#6291](https://github.com/diaspora/diaspora/pull/6291)
+* Replace jquery.autocomplete with typeahead.js [#6293](https://github.com/diaspora/diaspora/pull/6293)
+* Redesign sidebars on stream pages [#6309](https://github.com/diaspora/diaspora/pull/6309)
+* Improve ignored users styling [#6349](https://github.com/diaspora/diaspora/pull/6349)
+* Use Blueimp image gallery instead of lightbox [#6301](https://github.com/diaspora/diaspora/pull/6301)
+* Unify mobile and desktop header design [#6285](https://github.com/diaspora/diaspora/pull/6285)
+* Add white background and box-shadow to stream elements [#6324](https://github.com/diaspora/diaspora/pull/6324)
+* Override Bootstrap list group design [#6345](https://github.com/diaspora/diaspora/pull/6345)
+* Clean up publisher code [#6336](https://github.com/diaspora/diaspora/pull/6336)
+* Port conversations to new design [#6431](https://github.com/diaspora/diaspora/pull/6431)
+* Hide cancel button in publisher on small screens [#6435](https://github.com/diaspora/diaspora/pull/6435)
+* Replace mobile background with color [#6415](https://github.com/diaspora/diaspora/pull/6415)
+* Port flash messages to backbone [#6395](https://github.com/diaspora/diaspora/pull/6395)
+* Change login/registration/forgot password button color [#6504](https://github.com/diaspora/diaspora/pull/6504)
+* A note regarding ignoring users was added to the failure messages on commenting/liking [#6646](https://github.com/diaspora/diaspora/pull/6646)
+* Replace sidetiq with sidekiq-cron [#6616](https://github.com/diaspora/diaspora/pull/6616)
+* Refactor mobile comment section [#6509](https://github.com/diaspora/diaspora/pull/6509)
+* Set vertical resize as default for all textareas [#6654](https://github.com/diaspora/diaspora/pull/6654)
+* Unifiy max-widths and page layouts [#6675](https://github.com/diaspora/diaspora/pull/6675)
+* Enable autosizing for all textareas [#6674](https://github.com/diaspora/diaspora/pull/6674)
+* Stream faces are gone [#6686](https://github.com/diaspora/diaspora/pull/6686)
+* Refactor mobile javascript and add tests [#6394](https://github.com/diaspora/diaspora/pull/6394)
+* Dropped `parent_author_signature` from relayables [#6586](https://github.com/diaspora/diaspora/pull/6586)
+* Attached ShareVisibilities to the User, not the Contact [#6723](https://github.com/diaspora/diaspora/pull/6723)
+* Refactor mentions input, now based on typeahead.js [#6728](https://github.com/diaspora/diaspora/pull/6728)
+* Optimized the pod up checks [#6727](https://github.com/diaspora/diaspora/pull/6727)
+* Prune and do not create aspect visibilities for public posts [#6732](https://github.com/diaspora/diaspora/pull/6732)
+* Optimized mobile login and registration forms [#6764](https://github.com/diaspora/diaspora/pull/6764)
+* Redesign stream pages [#6535](https://github.com/diaspora/diaspora/pull/6535)
+* Improve search and mentions suggestions [#6788](https://github.com/diaspora/diaspora/pull/6788)
+* Redesign back to top button [#6782](https://github.com/diaspora/diaspora/pull/6782)
+* Adjusted Facebook integration for a successful review [#6778](https://github.com/diaspora/diaspora/pull/6778)
+* Redirect to the sign-in page instead of the stream on account deletion [#6784](https://github.com/diaspora/diaspora/pull/6784)
+* Removed own unicorn killer by a maintained third-party gem [#6792](https://github.com/diaspora/diaspora/pull/6792)
+* Removed deprecated `REDISTOGO_URL` environment variable [#6863](https://github.com/diaspora/diaspora/pull/6863)
+* Use Poltergeist instead of Selenium [#6768](https://github.com/diaspora/diaspora/pull/6768)
+* Redesigned the landing page and added dedicated notes for podmins [#6268](https://github.com/diaspora/diaspora/pull/6268)
+* Moved the entire federation implementation into its own gem. 🎉 [#6873](https://github.com/diaspora/diaspora/pull/6873)
+* Remove `StatusMessage#raw_message` [#6921](https://github.com/diaspora/diaspora/pull/6921)
+* Extract photo export into a service class [#6922](https://github.com/diaspora/diaspora/pull/6922)
+* Use handlebars template for aspect membership dropdown [#6864](https://github.com/diaspora/diaspora/pull/6864)
+* Extract relayable signatures into their own tables [#6932](https://github.com/diaspora/diaspora/pull/6932)
+* Remove outdated columns from posts table [#6940](https://github.com/diaspora/diaspora/pull/6940)
+* Remove some unused routes [#6781](https://github.com/diaspora/diaspora/pull/6781)
+* Consolidate sidekiq queues [#6950](https://github.com/diaspora/diaspora/pull/6950)
+* Don't re-render the whole comment stream when adding comments [#6406](https://github.com/diaspora/diaspora/pull/6406)
+* Drop legacy invitation system [#6976](https://github.com/diaspora/diaspora/pull/6976)
+* More consistent and updated meta tags throughout [#6998](https://github.com/diaspora/diaspora/pull/6998)
+
+## Bug fixes
+* Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852)
+* Improve accessibility of a couple pages [#6227](https://github.com/diaspora/diaspora/pull/6227)
+* Capitalize "Powered by diaspora" [#6254](https://github.com/diaspora/diaspora/pull/6254)
+* Display username and avatar for NSFW posts in mobile view [#6245](https://github.com/diaspora/diaspora/pull/6245)
+* Prevent multiple comment boxes on mobile [#6363](https://github.com/diaspora/diaspora/pull/6363)
+* Correctly display location in post preview [#6429](https://github.com/diaspora/diaspora/pull/6429)
+* Do not fail when submitting an empty comment in the mobile view [#6543](https://github.com/diaspora/diaspora/pull/6543)
+* Limit flash message width on small devices [#6529](https://github.com/diaspora/diaspora/pull/6529)
+* Add navbar on mobile when not logged in [#6483](https://github.com/diaspora/diaspora/pull/6483)
+* Fix timeago tooltips for reshares [#6648](https://github.com/diaspora/diaspora/pull/6648)
+* "Getting started" is now turned off after first visit on mobile [#6681](https://github.com/diaspora/diaspora/pull/6681)
+* Fixed a 500 when liking on mobile without JS enabled [#6683](https://github.com/diaspora/diaspora/pull/6683)
+* Fixed profile image upload in the mobile UI [#6684](https://github.com/diaspora/diaspora/pull/6684)
+* Fixed eye not stopping all processes when trying to exit `script/server` [#6693](https://github.com/diaspora/diaspora/pull/6693)
+* Do not change contacts count when marking notifications on the contacts page as read [#6718](https://github.com/diaspora/diaspora/pull/6718)
+* Fix typeahead for non-latin characters [#6741](https://github.com/diaspora/diaspora/pull/6741)
+* Fix upload size error on mobile [#6803](https://github.com/diaspora/diaspora/pull/6803)
+* Connection tester handles invalid NodeInfo implementations [#6890](https://github.com/diaspora/diaspora/pull/6890)
+* Do not allow to change email to an already used one [#6905](https://github.com/diaspora/diaspora/pull/6905)
+* Correctly filter mentions on the server side [#6902](https://github.com/diaspora/diaspora/pull/6902)
+* Add aspects to the aspect membership dropdown when creating them on the getting started page [#6864](https://github.com/diaspora/diaspora/pull/6864)
+* Strip markdown from message preview in conversations list [#6923](https://github.com/diaspora/diaspora/pull/6923)
+* Improve tag stream performance [#6903](https://github.com/diaspora/diaspora/pull/6903)
+* Only show mutual contacts in conversations auto suggestions [#7001](https://github.com/diaspora/diaspora/pull/7001)
+
+## Features
+* Support color themes [#6033](https://github.com/diaspora/diaspora/pull/6033)
+* Add mobile services and privacy settings pages [#6086](https://github.com/diaspora/diaspora/pull/6086)
+* Optionally make your extended profile details public [#6162](https://github.com/diaspora/diaspora/pull/6162)
+* Add admin dashboard showing latest diaspora\* version [#6216](https://github.com/diaspora/diaspora/pull/6216)
+* Display poll & location on mobile [#6238](https://github.com/diaspora/diaspora/pull/6238)
+* Update counts on contacts page dynamically [#6240](https://github.com/diaspora/diaspora/pull/6240)
+* Add support for relay based public post federation [#6207](https://github.com/diaspora/diaspora/pull/6207)
+* Bigger mobile publisher [#6261](https://github.com/diaspora/diaspora/pull/6261)
+* Backend information panel & health checks for known pods [#6290](https://github.com/diaspora/diaspora/pull/6290)
+* Allow users to view a posts locations on an OpenStreetMap [#6256](https://github.com/diaspora/diaspora/pull/6256)
+* Redesign and unify error pages [#6428](https://github.com/diaspora/diaspora/pull/6428)
+* Redesign and refactor report admin interface [#6378](https://github.com/diaspora/diaspora/pull/6378)
+* Add permalink icon to stream elements [#6457](https://github.com/diaspora/diaspora/pull/6457)
+* Move reshare count to interactions for stream elements [#6487](https://github.com/diaspora/diaspora/pull/6487)
+* Posts of ignored users are now visible on that profile page [#6617](https://github.com/diaspora/diaspora/pull/6617)
+* Add white color theme [#6631](https://github.com/diaspora/diaspora/pull/6631)
+* Add answer counts to poll [#6641](https://github.com/diaspora/diaspora/pull/6641)
+* Check for collapsible posts after images in posts have loaded [#6671](https://github.com/diaspora/diaspora/pull/6671)
+* Add reason for post report to email sent to admins [#6679](https://github.com/diaspora/diaspora/pull/6679)
+* Add links to the single post view of the related post to photos in the photo stream [#6621](https://github.com/diaspora/diaspora/pull/6621)
+* Add a note for people with disabled JavaScript [#6777](https://github.com/diaspora/diaspora/pull/6777)
+* Do not include conversation subject in notification mail [#6910](https://github.com/diaspora/diaspora/pull/6910)
+* Add 'Be excellent to each other!' to the sidebar [#6914](https://github.com/diaspora/diaspora/pull/6914)
+* Expose Sidekiq dead queue configuration options
+* Properly support pluralization in timeago strings [#6926](https://github.com/diaspora/diaspora/pull/6926)
+* Return all contacts in people search [#6951](https://github.com/diaspora/diaspora/pull/6951)
+* Make screenreaders read alerts [#6973](https://github.com/diaspora/diaspora/pull/6973)
+* Display message when there are no posts in a stream [#6974](https://github.com/diaspora/diaspora/pull/6974)
+* Add bootstrap-markdown editor to the publisher [#6551](https://github.com/diaspora/diaspora/pull/6551)
+* Don't create notifications for ignored users [#6984](https://github.com/diaspora/diaspora/pull/6984)
+* Fetch missing persons when receiving a mention for them [#6992](https://github.com/diaspora/diaspora/pull/6992)
+
+# 0.5.10.2
+
+Update to Rails 4.2.7.1 which fixes [CVE-2016-6316](https://groups.google.com/forum/#!topic/ruby-security-ann/8B2iV2tPRSE) and [CVE-2016-6317](https://groups.google.com/forum/#!topic/ruby-security-ann/WccgKSKiPZA).
+
+# 0.5.10.1
+
+We made a mistake and removed `mysql2` from the `Gemfile.lock` in a recent gem update. Since this could cause some issues for some installations, we decided to release a hotfix.
+
+# 0.5.10.0
+
+## Refactor
+
+* Removed the publisher from a user's photo stream due to various issues [#6851](https://github.com/diaspora/diaspora/pull/6851)
+* Don't implicitly ignore missing templateName in app.views.Base [#6877](https://github.com/diaspora/diaspora/pull/6877)
+
+# 0.5.9.1
+
+Update Nokogiri to 1.6.8, which in turn updates libxml2 to 2.9.4 and libxslt to 1.1.29,
+addressing a range of security issues. See https://groups.google.com/forum/#!topic/ruby-security-ann/RCHyF5K9Lbc
+for more details.
+
+# 0.5.9.0
+
+## Refactor
+* Remove unused mentions regex [#6810](https://github.com/diaspora/diaspora/pull/6810)
+
+## Bug fixes
+* Fix back to top button not appearing on Webkit browsers [#6782](https://github.com/diaspora/diaspora/pull/6782)
+* Don't reset the notification timestamp when marking them as read [#6821](https://github.com/diaspora/diaspora/pull/6821)
+
+## Features
+
+* The sender's diaspora-ID is now shown in invitation mails [#6817](https://github.com/diaspora/diaspora/pull/6817)
+
+# 0.5.8.0
+
+## Refactor
+* Sort tag autocompletion by tag name [#6734](https://github.com/diaspora/diaspora/pull/6734)
+* Make account deletions faster by adding an index [#6771](https://github.com/diaspora/diaspora/pull/6771)
+
+## Bug fixes
+* Fix empty name field when editing aspect names [#6706](https://github.com/diaspora/diaspora/pull/6706)
+* Fix internal server error when trying to log out of an expired session [#6707](https://github.com/diaspora/diaspora/pull/6707)
+* Only mark unread notifications as read [#6711](https://github.com/diaspora/diaspora/pull/6711)
+* Use https for OEmbeds [#6748](https://github.com/diaspora/diaspora/pull/6748)
+* Fix birthday issues on leap days [#6738](https://github.com/diaspora/diaspora/pull/6738)
+
+## Features
+* Added the footer to conversation pages [#6710](https://github.com/diaspora/diaspora/pull/6710)
+* Drop ChromeFrame and display an error page on old IE versions instead [#6751](https://github.com/diaspora/diaspora/pull/6751)
+
+# 0.5.7.1
+
+This security release disables post fetching for relayables. Due to an insecure implementation, fetching of root posts for relayables could allow an attacker to distribute malicious/spoofed/modified posts for any person.
+
+Disabling the fetching will make the current federation a bit less reliable, but for a hotfix, this is the best solution. We will re-enable the fetching in 0.6.0.0 when we moved out the federation into its own library and are able to implement further validation during fetches.
+
+# 0.5.7.0
+
+## Refactor
+* Internationalize controller rescue\_from text [#6554](https://github.com/diaspora/diaspora/pull/6554)
+* Make mention parsing a bit more robust [#6658](https://github.com/diaspora/diaspora/pull/6658)
+* Remove unlicensed images [#6673](https://github.com/diaspora/diaspora/pull/6673)
+* Removed unused contacts\_title [#6687](https://github.com/diaspora/diaspora/pull/6687)
+
+## Bug fixes
+* Fix plural rules handling more than wanted as "one" [#6630](https://github.com/diaspora/diaspora/pull/6630)
+* Fix `suppress_annoying_errors` eating too much errors [#6653](https://github.com/diaspora/diaspora/pull/6653)
+* Ensure the rubyzip gem is properly loaded [#6659](https://github.com/diaspora/diaspora/pull/6659)
+* Fix mobile registration layout after failed registration [#6677](https://github.com/diaspora/diaspora/pull/6677)
+* Fix mirrored names when using a RTL language [#6680](https://github.com/diaspora/diaspora/pull/6680)
+* Disable submitting a post multiple times in the mobile UI [#6682](https://github.com/diaspora/diaspora/pull/6682)
+
+## Features
+* Keyboard shortcuts now do work on profile pages as well [#6647](https://github.com/diaspora/diaspora/pull/6647/files)
+* Add the podmin email address to 500 errors [#6652](https://github.com/diaspora/diaspora/pull/6652)
+
+# 0.5.6.3
+
+Fix evil regression caused by Active Model no longer exposing
+`include_root_in_json` in instances.
+
+# 0.5.6.2
+
+* Fix [CVE-2016-0751](https://groups.google.com/forum/#!topic/rubyonrails-security/9oLY_FCzvoc) - Possible Object Leak and Denial of Service attack in Action Pack
+* Fix [CVE-2015-7581](https://groups.google.com/forum/#!topic/rubyonrails-security/dthJ5wL69JE) - Object leak vulnerability for wildcard controller routes in Action Pack
+* Fix [CVE-2015-7576](https://groups.google.com/forum/#!topic/rubyonrails-security/ANv0HDHEC3k) - Timing attack vulnerability in basic authentication in Action Controller
+* Fix [CVE-2016-0752](https://groups.google.com/forum/#!topic/rubyonrails-security/335P1DcLG00) - Possible Information Leak Vulnerability in Action View
+* Fix [CVE-2016-0753](https://groups.google.com/forum/#!topic/rubyonrails-security/6jQVC1geukQ) - Possible Input Validation Circumvention in Active Model
+* Fix [CVE-2015-7577](https://groups.google.com/forum/#!topic/rubyonrails-security/cawsWcQ6c8g) - Nested attributes rejection proc bypass in Active Record
+* Fix [CVE-2015-7579](https://groups.google.com/forum/#!topic/rubyonrails-security/OU9ugTZcbjc) - XSS vulnerability in rails-html-sanitizer
+* Fix [CVE-2015-7578](https://groups.google.com/forum/#!topic/rubyonrails-security/uh--W4TDwmI) - Possible XSS vulnerability in rails-html-sanitizer
+
+# 0.5.6.1
+
+* Fix Nokogiri CVE-2015-7499
+* Fix unsafe "Remember me" cookies in Devise
+
+# 0.5.6.0
+
+## Refactor
+* Add more integration tests with the help of the new diaspora-federation gem [#6539](https://github.com/diaspora/diaspora/pull/6539)
+
+## Bug fixes
+* Fix mention autocomplete when pasting the username [#6510](https://github.com/diaspora/diaspora/pull/6510)
+* Use and update updated\_at for notifications [#6573](https://github.com/diaspora/diaspora/pull/6573)
+* Ensure the author signature is checked when receiving a relayable [#6539](https://github.com/diaspora/diaspora/pull/6539)
+* Do not try to display hovercards when logged out [#6587](https://github.com/diaspora/diaspora/pull/6587)
+
+## Features
+
+* Display hovercards without aspect dropdown when logged out [#6603](https://github.com/diaspora/diaspora/pull/6603)
+* Add media.ccc.de as a trusted oEmbed endpoint
+
+# 0.5.5.1
+
+* Fix XSS on profile pages
+* Bump nokogiri to fix several libxml2 CVEs, see http://www.ubuntu.com/usn/usn-2834-1/
+
+# 0.5.5.0
+
+## Bug fixes
+* Redirect to sign in page when a background request fails with 401 [#6496](https://github.com/diaspora/diaspora/pull/6496)
+* Correctly skip setting sidekiq logfile on Heroku [#6500](https://github.com/diaspora/diaspora/pull/6500)
+* Fix notifications for interactions by non-contacts [#6498](https://github.com/diaspora/diaspora/pull/6498)
+* Fix issue where the publisher was broken on profile pages [#6503](https://github.com/diaspora/diaspora/pull/6503)
+* Prevent participations being created for invalid interactions [#6552](https://github.com/diaspora/diaspora/pull/6552)
+* Improve federation for reshare related interactions [#6481](https://github.com/diaspora/diaspora/pull/6481)
+
+# 0.5.4.0
+
+## Refactor
+*  Improve infinite scroll triggering [#6451](https://github.com/diaspora/diaspora/pull/6451)
+
+## Bug fixes
+* Skip first getting started step if it looks done already [#6456](https://github.com/diaspora/diaspora/pull/6456)
+* Normalize new followed tags and insert them alphabetically [#6454](https://github.com/diaspora/diaspora/pull/6454)
+* Add avatar fallback for notification dropdown [#6463](https://github.com/diaspora/diaspora/pull/6463)
+* Improve handling of j/k hotkeys [#6462](https://github.com/diaspora/diaspora/pull/6462)
+* Fix JS error caused by hovercards [6480](https://github.com/diaspora/diaspora/pull/6480)
+
+## Features
+* Show spinner on initial stream load [#6384](https://github.com/diaspora/diaspora/pull/6384)
+* Add new moderator role. Moderators can view and act on reported posts [#6351](https://github.com/diaspora/diaspora/pull/6351)
+* Only post to the primary tumblr blog [#6386](https://github.com/diaspora/diaspora/pull/6386)
+* Always show public photos on profile page [#6398](https://github.com/diaspora/diaspora/pull/6398)
+* Expose Unicorn's pid option to our configuration system [#6411](https://github.com/diaspora/diaspora/pull/6411)
+* Add stream of all public posts [#6465](https://github.com/diaspora/diaspora/pull/6465)
+* Reload stream when clicking on already active one [#6466](https://github.com/diaspora/diaspora/pull/6466)
+* Sign in user before evaluating post visibility [#6490](https://github.com/diaspora/diaspora/pull/6490)
+
+# 0.5.3.1
+
+Fix a leak of potentially private profile data to unauthorized users who were sharing with the person
+and on a pod that received that data.
+
+# 0.5.3.0
+
+## Refactor
+* Drop broken correlations from the admin pages [#6223](https://github.com/diaspora/diaspora/pull/6223)
+* Extract PostService from PostsController [#6208](https://github.com/diaspora/diaspora/pull/6208)
+* Drop outdated/unused mbp-respond.min.js and mbp-modernizr-custom.js [#6257](https://github.com/diaspora/diaspora/pull/6257)
+* Refactor ApplicationController#after\_sign\_out\_path\_for [#6258](https://github.com/diaspora/diaspora/pull/6258)
+* Extract StatusMessageService from StatusMessagesController [#6280](https://github.com/diaspora/diaspora/pull/6280)
+* Refactor HomeController#toggle\_mobile [#6260](https://github.com/diaspora/diaspora/pull/6260)
+* Extract CommentService from CommentsController [#6307](https://github.com/diaspora/diaspora/pull/6307)
+* Extract user/profile discovery into the diaspora\_federation-rails gem [#6310](https://github.com/diaspora/diaspora/pull/6310)
+* Refactor PostPresenter [#6315](https://github.com/diaspora/diaspora/pull/6315)
+* Convert BackToTop to a backbone view [#6279](https://github.com/diaspora/diaspora/pull/6279) and [#6360](https://github.com/diaspora/diaspora/pull/6360)
+* Automatically follow the new HQ-Account [#6369](https://github.com/diaspora/diaspora/pull/6369)
+
+## Bug fixes
+* Fix indentation and a link title on the default home page [#6212](https://github.com/diaspora/diaspora/pull/6212)
+* Bring peeping Tom on the 404 page back [#6226](https://github.com/diaspora/diaspora/pull/6226)
+* Fix mobile photos index page [#6243](https://github.com/diaspora/diaspora/pull/6243)
+* Fix conversations view with no contacts [#6266](https://github.com/diaspora/diaspora/pull/6266)
+* Links in the left sidebar are now clickable on full width [#6267](https://github.com/diaspora/diaspora/pull/6267)
+* Guard against passing nil into person\_image\_tag [#6286](https://github.com/diaspora/diaspora/pull/6286)
+* Prevent Handlebars from messing up indentation of pre tags [#6339](https://github.com/diaspora/diaspora/pull/6339)
+* Fix pagination design on notifications page [#6364](https://github.com/diaspora/diaspora/pull/6364)
+
+## Features
+
+* Implement NodeInfo [#6239](https://github.com/diaspora/diaspora/pull/6239)
+* Display original author on reshares of NSFW posts [#6270](https://github.com/diaspora/diaspora/pull/6270)
+* Use avatars in hovercards as links to the profile [#6297](https://github.com/diaspora/diaspora/pull/6297)
+* Remove avatars of ignored users from stream faces [#6320](https://github.com/diaspora/diaspora/pull/6320)
+* New /m route to force the mobile view [#6354](https://github.com/diaspora/diaspora/pull/6354)
+
+# 0.5.2.0
+
+## Refactor
+* Update perfect-scrollbar [#6085](https://github.com/diaspora/diaspora/pull/6085)
+* Remove top margin for first heading in a post [#6110](https://github.com/diaspora/diaspora/pull/6110)
+* Add link to pod statistics in right navigation [#6117](https://github.com/diaspora/diaspora/pull/6117)
+* Update to Rails 4.2.3 [#6140](https://github.com/diaspora/diaspora/pull/6140)
+* Refactor person related URL generation [#6168](https://github.com/diaspora/diaspora/pull/6168)
+* Move webfinger and HCard generation out of the core and embed the `diaspora_federation-rails` gem [#6151](https://github.com/diaspora/diaspora/pull/6151/)
+* Refactor rspec tests to to use `let` instead of before blocks [#6199](https://github.com/diaspora/diaspora/pull/6199)
+* Refactor tests for EXIF stripping [#6183](https://github.com/diaspora/diaspora/pull/6183)
+
+## Bug fixes
+* Precompile facebox images [#6105](https://github.com/diaspora/diaspora/pull/6105)
+* Fix wrong closing a-tag [#6111](https://github.com/diaspora/diaspora/pull/6111)
+* Fix mobile more-button wording when there are less than 15 posts [#6118](https://github.com/diaspora/diaspora/pull/6118)
+* Fix reappearing flash boxes during sign-in [#6146](https://github.com/diaspora/diaspora/pull/6146)
+* Capitalize Wiki link [#6193](https://github.com/diaspora/diaspora/pull/6193)
+
+## Features
+* Add configuration options for some debug logs [#6090](https://github.com/diaspora/diaspora/pull/6090)
+* Send new users a welcome message from the podmin [#6128](https://github.com/diaspora/diaspora/pull/6128)
+* Cleanup temporary upload files daily [#6147](https://github.com/diaspora/diaspora/pull/6147)
+* Add guid to posts and comments in the user export [#6185](https://github.com/diaspora/diaspora/pull/6185)
+
 # 0.5.1.2

 diaspora\* versions prior 0.5.1.2 leaked potentially private profile data (namely the bio, birthday, gender and location fields) to
--- a/275
+++ b/275
@@ -1,47 +1,49 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"

-gem "rails", "4.2.2"
+gem "rails", "5.1.4"

 # Legacy Rails features, remove me!
-
-# caches_page
-gem "actionpack-action_caching"
-gem "actionpack-page_caching"
-
 # responders (class level)
-gem "responders", "2.1.0"
+gem "responders", "2.4.0"

 # Appserver

-gem "unicorn", "4.9.0", require: false
+gem "unicorn", "5.3.0", require: false
+gem "unicorn-worker-killer", "0.4.4"
+
+# Federation
+
+gem "diaspora_federation-json_schema", "0.2.2"
+gem "diaspora_federation-rails", "0.2.2"

 # API and JSON

-gem "acts_as_api", "0.4.2"
-gem "json",        "1.8.2"
+gem "acts_as_api", "1.0.1"
+gem "json",        "2.1.0"
+gem "json-schema", "2.8.0"

 # Authentication

-gem "devise", "3.4.1"
-gem "devise_lastseenable", "0.0.4"
-gem "devise-token_authenticatable", "~> 0.3.0"
+gem "devise", "4.3.0"
+gem "devise_lastseenable", "0.0.6"

 # Captcha

-gem "simple_captcha2", "0.3.4", require: "simple_captcha"
+gem "simple_captcha2", "0.4.3", require: "simple_captcha"

 # Background processing

-gem "sidekiq", "3.3.4"
-gem "sinatra", "1.4.6"
+gem "sidekiq", "5.0.4"

 # Scheduled processing

-gem "sidetiq", "0.6.3"
+gem "sidekiq-cron", "0.6.3"

 # Compression

-gem "uglifier", "2.7.1"
+gem "uglifier", "3.2.0"

 # Configuration

@@ -49,135 +51,153 @@ gem "configurate", "0.3.1"

 # Cross-origin resource sharing

-gem "rack-cors", "0.4.0", require: "rack/cors"
+gem "rack-cors", "1.0.1", require: "rack/cors"

 # CSS

-gem "bootstrap-sass", "2.3.2.2"
-gem "compass-rails",  "2.0.4"
-gem "sass-rails",     "5.0.1"
-gem "autoprefixer-rails", "5.1.11"
+gem "autoprefixer-rails",     "7.1.4.1"
+gem "bootstrap-sass",         "3.3.7"
+gem "bootstrap-switch-rails", "3.3.3"
+gem "compass-rails",          "3.0.2"
+gem "sass-rails",             "5.0.6"
+gem "sprockets-rails",        "3.2.1"

 # Database

-ENV["DB"] ||= "mysql"
+group :mysql, optional: true do
+  gem "mysql2", "0.4.9"
+end
+group :postgresql, optional: true do
+  gem "pg",     "0.21.0"
+end

-gem "mysql2", "0.3.18" if ENV["DB"] == "all" || ENV["DB"] == "mysql"
-gem "pg",     "0.18.1" if ENV["DB"] == "all" || ENV["DB"] == "postgres"

-gem "activerecord-import", "0.7.0"
+gem "activerecord-import", "0.20.1"

 # File uploading

-gem "carrierwave", "0.10.0"
-gem "fog",         "1.30.0"
-gem "mini_magick", "4.2.3"
-gem "remotipart",  "1.2.1"
+gem "carrierwave", "1.1.0"
+gem "fog-aws",     "1.4.1"
+gem "mini_magick", "4.8.0"

 # GUID generation
-gem "uuid", "2.3.7"
+gem "uuid", "2.3.8"

 # Icons

-gem "entypo-rails", "2.2.3"
+gem "entypo-rails", "3.0.0"

 # JavaScript

-gem "backbone-on-rails",                                "1.1.2.1"
-gem "handlebars_assets",                                "0.20.1"
-gem "jquery-rails",                                     "4.0.4"
-gem "jquery-ui-rails",                                  "5.0.3"
-gem "js_image_paths",                                   "0.0.2"
-gem "js-routes",                                        "1.0.1"
+gem "handlebars_assets", "0.23.2"
+gem "jquery-rails",      "4.3.1"
+gem "js-routes",         "1.4.1"
+gem "js_image_paths",    "0.1.1"

 source "https://rails-assets.org" do
-  gem "rails-assets-jquery",                              "1.11.2" # Should be kept in sync with jquery-rails
+  gem "rails-assets-jquery",                              "3.2.1" # Should be kept in sync with jquery-rails
+  gem "rails-assets-jquery.ui",                           "1.11.4"

-  gem "rails-assets-markdown-it",                         "4.2.1"
-  gem "rails-assets-markdown-it-hashtag",                 "0.3.1"
-  gem "rails-assets-markdown-it-diaspora-mention",        "0.3.0"
-  gem "rails-assets-markdown-it-sanitizer",               "0.3.1"
+  gem "rails-assets-highlightjs",                         "9.12.0"
+  gem "rails-assets-markdown-it",                         "8.4.0"
+  gem "rails-assets-markdown-it-hashtag",                 "0.4.0"
+  gem "rails-assets-markdown-it-diaspora-mention",        "1.2.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",                         "8.5.0"
+
+  gem "rails-assets-backbone",                            "1.3.3"
+  gem "rails-assets-bootstrap-markdown",                  "2.10.0"
+  gem "rails-assets-corejs-typeahead",                    "1.1.1"
+  gem "rails-assets-fine-uploader",                       "5.13.0"

  # jQuery plugins

-  gem "rails-assets-jeresig--jquery.hotkeys",       "0.2.0"
-  gem "rails-assets-jquery-idletimer",              "1.0.1"
-  gem "rails-assets-jquery-placeholder",            "2.1.1"
-  gem "rails-assets-jquery-textchange",             "0.2.3"
-  gem "rails-assets-perfect-scrollbar",             "0.5.9"
-  gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11"
+  gem "rails-assets-autosize",                            "4.0.0"
+  gem "rails-assets-blueimp-gallery",                     "2.27.0"
+  gem "rails-assets-jquery.are-you-sure",                 "1.9.0"
+  gem "rails-assets-jquery-placeholder",                  "2.3.1"
+  gem "rails-assets-jquery-textchange",                   "0.2.3"
+  gem "rails-assets-perfect-scrollbar",                   "0.6.16"
 end

-gem "facebox-rails", "0.2.0"
-
 # Localization

-gem "http_accept_language", "2.0.5"
+gem "http_accept_language", "2.1.1"
 gem "i18n-inflector-rails", "1.0.7"
-gem "rails-i18n",           "4.0.4"
+gem "rails-i18n",           "5.0.4"

 # Mail

-gem "markerb",             "1.0.2"
-gem "messagebus_ruby_api", "1.0.3"
+gem "markerb",             "1.1.0"
+
+# Map
+gem "leaflet-rails",       "1.2.0"

 # Parsing

-gem "nokogiri",          "1.6.6.2"
-gem "redcarpet",         "3.2.3"
-gem "twitter-text",      "1.12.0"
-gem "roxml",             "3.1.6"
-gem "ruby-oembed",       "0.8.14"
-gem "open_graph_reader", "0.6.1"
+gem "nokogiri",          "1.8.1"
+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"
+gem "twitter-text",      "1.14.7"
+
+# RTL support
+
+gem "string-direction", "1.2.0"
+
+# Security Headers
+
+gem "secure_headers", "3.7.1"

 # Services

-gem "omniauth",           "1.2.2"
-gem "omniauth-facebook",  "2.0.1"
-gem "omniauth-tumblr",    "1.1"
-gem "omniauth-twitter",   "1.2.0"
-gem "twitter",            "5.14.0"
+gem "omniauth",           "1.6.1"
+gem "omniauth-facebook",  "4.0.0"
+gem "omniauth-tumblr",    "1.2"
+gem "omniauth-twitter",   "1.4.0"
+gem "twitter",            "6.1.0"
 gem "omniauth-wordpress", "0.2.2"

+# OpenID Connect
+gem "openid_connect", "1.1.3"
+
 # Serializers

-gem "active_model_serializers", "0.9.3"
+gem "active_model_serializers", "0.9.7"

 # XMPP chat dependencies
-gem "diaspora-vines",             "~> 0.1.27"
-gem "rails-assets-diaspora_jsxc", "~> 0.1.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

-gem "acts-as-taggable-on", "3.5.0"
+gem "acts-as-taggable-on", "5.0.0"

 # URIs and HTTP

-gem "addressable",        "2.3.8", require: "addressable/uri"
-gem "faraday",            "0.9.1"
-gem "faraday_middleware", "0.9.1"
+gem "addressable",        "2.5.2", require: "addressable/uri"
+gem "faraday",            "0.11.0" # also update User-Agent in OpenID specs
+gem "faraday_middleware", "0.12.2"
 gem "faraday-cookie_jar", "0.0.6"
-gem "typhoeus",           "0.7.1"
+gem "typhoeus",           "1.3.0"

 # Views

-gem "gon",                     "5.2.3"
-gem "haml",                    "4.0.6"
-gem "mobile-fu",               "1.3.1"
-gem "will_paginate",           "3.0.7"
-gem "rails-timeago",           "2.11.0"
+gem "gon",                     "6.1.0"
+gem "hamlit",                  "2.8.4"
+gem "mobile-fu",               "1.4.0"
+gem "rails-timeago",           "2.16.0"
+gem "will_paginate",           "3.1.6"

 # Logging

-gem "logging-rails", "0.5.0", require: "logging/rails"
+gem "logging-rails", "0.6.0", require: "logging/rails"

 # Reading and writing zip files

-gem "rubyzip", "1.1.7"
+gem "rubyzip", "1.2.1", require: "zip"

 # Prevent occasions where minitest is not bundled in
 # packaged versions of ruby. See following issues/prs:
@@ -186,6 +206,8 @@ gem "rubyzip", "1.1.7"
 # https://github.com/discourse/discourse/pull/238
 gem "minitest"

+gem "versionist", "1.6.0"
+
 # Windows and OSX have an execjs compatible runtime built-in, Linux users should
 # install Node.js or use "therubyracer".
 #
@@ -194,22 +216,14 @@ gem "minitest"
 # gem "therubyracer", :platform => :ruby

 group :production do # we don"t install these on travis to speed up test runs
-  # Administration
-
-  gem "rails_admin", "0.6.7"
-
  # Analytics

  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.7.pre"
+  gem "eye", "0.9.2"

  # Redirects

@@ -218,78 +232,85 @@ group :production do # we don"t install these on travis to speed up test runs

  # Third party asset hosting

-  gem "asset_sync", "1.1.0", require: false
+  gem "asset_sync", "2.2.0", require: false
 end

 group :development do
  # Automatic test runs
-  gem "guard-cucumber", "1.5.4"
-  gem "guard-jshintrb", "1.1.1"
-  gem "guard-rspec",    "4.5.0"
-  gem "guard-rubocop",  "1.2.0"
-  gem "guard",          "2.12.5", require: false
-  gem "rb-fsevent",     "0.9.4", require: false
-  gem "rb-inotify",     "0.9.5", require: false
+  gem "guard",          "2.14.1", require: false
+  gem "guard-cucumber", "2.1.2", require: false
+  gem "guard-rspec",    "4.7.3", require: false
+  gem "guard-rubocop",  "1.3.0", require: false
+  gem "rb-fsevent",     "0.10.2", require: false
+  gem "rb-inotify",     "0.9.10", require: false

  # Linters
-  gem "jshintrb", "0.3.0"
-  gem "rubocop",  "0.31.0"
+  gem "haml_lint",      "0.26.0", require: false
+  gem "pronto",         "0.9.5", require: false
+  gem "pronto-eslint",  "0.9.1", require: false
+  gem "pronto-haml",    "0.9.0", require: false
+  gem "pronto-rubocop", "0.9.0", require: false
+  gem "pronto-scss",    "0.9.1", require: false
+  gem "rubocop",        "0.50.0", require: false

  # Preloading environment

-  gem "spring", "1.3.5"
+  gem "spring", "2.0.2"
  gem "spring-commands-rspec", "1.0.4"
  gem "spring-commands-cucumber", "1.0.1"

  # Debugging
  gem "pry"
-  gem "pry-debundle"
  gem "pry-byebug"

  # test coverage
-  gem "simplecov", "0.10.0", require: false
+  gem "simplecov", "0.14.1", require: false
+
+  gem "turbo_dev_assets", "0.0.2"
 end

 group :test do
  # RSpec (unit tests, some integration tests)

-  gem "fixture_builder",   "0.4.1"
-  gem "fuubar",            "2.0.0"
-  gem "rspec-instafail",   "0.2.6", require: false
-  gem "test_after_commit", "0.4.1"
+  gem "fixture_builder",   "0.5.0"
+  gem "fuubar",            "2.2.0"
+  gem "json-schema-rspec", "0.0.4"
+  gem "rspec-json_expectations", "~> 2.1"

  # Cucumber (integration tests)

-  gem "capybara",           "2.4.4"
-  gem "database_cleaner" ,  "1.4.1"
-  gem "selenium-webdriver", "2.45.0"
+  gem "capybara",           "2.15.1"
+  gem "database_cleaner",   "1.6.1"
+  gem "poltergeist",        "1.16.0"

-  source "https://rails-assets.org" do
-    gem "rails-assets-jquery-simulate",     "1.0.1"
-    gem "rails-assets-jquery-simulate-ext", "1.3.0"
-  end
+  gem "cucumber-api-steps", "0.13", require: false

  # General helpers

-  gem "factory_girl_rails", "4.5.0"
-  gem "timecop",            "0.7.3"
-  gem "webmock",            "1.21.0", require: false
-  gem "shoulda-matchers",   "2.8.0", require: false
+  gem "factory_girl_rails", "4.8.0"
+  gem "shoulda-matchers",   "3.1.2"
+  gem "timecop",            "0.9.1"
+  gem "webmock",            "3.0.1", require: false
+
+  gem "diaspora_federation-test", "0.2.2"
+
+  # Coverage
+  gem "coveralls", "0.8.21", require: false
 end

 group :development, :test do
  # RSpec (unit tests, some integration tests)
-  gem "rspec-rails",     "3.2.1"
+  gem "rspec-rails", "3.6.1"

  # Cucumber (integration tests)
-  gem "cucumber-rails",     "1.4.2", require: false
+  gem "cucumber-rails", "1.5.0", require: false

  # Jasmine (client side application tests (JS))
-  gem "jasmine",                   "2.2.0"
+  gem "jasmine",                   "2.8.0"
  gem "jasmine-jquery-rails",      "2.0.3"
-  gem "rails-assets-jasmine-ajax", "3.1.1", source: "https://rails-assets.org"
-  gem "sinon-rails",               "1.10.3"
+  gem "rails-assets-jasmine-ajax", "3.3.1", source: "https://rails-assets.org"
+  gem "sinon-rails",               "1.15.0"

-  # silence assets
-  gem "quiet_assets", "1.1.0"
+  # For `assigns` in controller specs
+  gem "rails-controller-testing", "1.0.2"
 end
--- a/Gemfile.lock
+++ b/Gemfile.lock
--- a/11
+++ b/11
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 guard :rspec, cmd: "bin/spring rspec", all_on_start: false, all_after_pass: false do
  watch(/^spec\/.+_spec\.rb$/)
  watch(/^lib\/(.+)\.rb$/)       {|m| "spec/lib/#{m[1]}_spec.rb" }
@@ -22,8 +24,7 @@ guard :rspec, cmd: "bin/spring rspec", all_on_start: false, all_after_pass: fals
 end

 guard(:cucumber,
-      command_prefix: "bin/spring",
-      bundler:        false,
+      cmd:            "bin/spring cucumber",
      all_on_start:   false,
      all_after_pass: false) do
  watch(/^features\/.+\.feature$/)
@@ -37,9 +38,3 @@ guard :rubocop, all_on_start: false, keep_failed: false do
  watch(/(?:app|config|db|lib|features|spec)\/.+\.rb$/)
  watch(/(config.ru|Gemfile|Guardfile|Rakefile)$/)
 end
-
-guard :jshintrb do
-  watch(/^app\/assets\/javascripts\/.+\.js$/)
-  watch(/^lib\/assets\/javascripts\/.+\.js$/)
-  watch(/^spec\/javascripts\/.+\.js$/)
-end
--- a/GNU-AGPL-3.0
+++ b/GNU-AGPL-3.0
--- a/README.md
+++ b/README.md
@@ -1,23 +1,23 @@
-# diaspora* 
-### a privacy-aware, distributed, open source social network
+# diaspora*
+### A privacy-aware, distributed, open source social network

-**master:** [![Build Status master](https://secure.travis-ci.org/diaspora/diaspora.png?branch=master)](http://travis-ci.org/diaspora/diaspora)
-**stable:** [![Build Status stable](https://secure.travis-ci.org/diaspora/diaspora.png?branch=stable)](http://travis-ci.org/diaspora/diaspora) |
-**develop:** [![Build Status develop](https://secure.travis-ci.org/diaspora/diaspora.png?branch=develop)](http://travis-ci.org/diaspora/diaspora) |
-[![Dependency Status](https://gemnasium.com/diaspora/diaspora.png?travis)](https://gemnasium.com/diaspora/diaspora)
-[![Code Climate](https://codeclimate.com/github/diaspora/diaspora.png)](https://codeclimate.com/github/diaspora/diaspora)
+**master:** [![Build Status master](https://secure.travis-ci.org/diaspora/diaspora.svg?branch=master)](http://travis-ci.org/diaspora/diaspora)
+**next-minor:** [![Build Status next-minor](https://secure.travis-ci.org/diaspora/diaspora.svg?branch=next-minor)](http://travis-ci.org/diaspora/diaspora)
+[![Coverage Status next-minor](https://coveralls.io/repos/github/diaspora/diaspora/badge.svg?branch=next-minor)](https://coveralls.io/github/diaspora/diaspora?branch=next-minor)|
+**develop:** [![Build Status develop](https://secure.travis-ci.org/diaspora/diaspora.svg?branch=develop)](http://travis-ci.org/diaspora/diaspora)
+[![Coverage Status develop](https://coveralls.io/repos/github/diaspora/diaspora/badge.svg?branch=develop)](https://coveralls.io/github/diaspora/diaspora?branch=develop) |
+[![Dependency Status](https://gemnasium.com/badges/github.com/diaspora/diaspora.svg)](https://gemnasium.com/diaspora/diaspora)
+[![Code Climate](https://codeclimate.com/github/diaspora/diaspora/badges/gpa.svg)](https://codeclimate.com/github/diaspora/diaspora)

 [Project site](https://diasporafoundation.org) |
 [Wiki](https://wiki.diasporafoundation.org) |
-[Bugtracker](http://github.com/diaspora/diaspora/issues) |
-[Discussions](https://www.loomio.org/groups/194) |
-[Mailing lists](https://wiki.diasporafoundation.org/How_We_Communicate#Mailing_Lists) |
+[Bugtracker](https://github.com/diaspora/diaspora/issues) |
+[Discussions and Support](https://discourse.diasporafoundation.org/) |
 [License](/COPYRIGHT) |
 [Authors](https://github.com/diaspora/diaspora/contributors)

 ## Installation

-
 You don't have to install diaspora* to use the network. There are many servers connected to diaspora*s network which are open to anyone, and you can create an account on one of these servers. Have a look at our [tips for finding a home](https://wiki.diasporafoundation.org/Choosing_a_pod), or you can just go straight to the [list of open servers](http://podupti.me) to sign up.

 Want to own your data and install diaspora*? Whether you just want to try it out, want to install it on your server or want to contribute and need a development setup, our [installation guides](https://wiki.diasporafoundation.org/Installation) will get you started!
@@ -30,9 +30,10 @@ Still haven't found an answer? Talk to us! Read [how we communicate](https://wik

 ## Contribute

-To keep diaspora*  growing and improving we need all help we can get. Whether you can contribute [code](https://wiki.diasporafoundation.org/Getting_started_with_contributing), [ideas](https://wiki.diasporafoundation.org/How_we_communicate#Loomio), [translations](https://wiki.diasporafoundation.org/Contribute_translations), [bug reports](https://wiki.diasporafoundation.org/How_to_report_a_bug) or simply extend the community as a [helpful user](https://wiki.diasporafoundation.org/Welcoming_committee) or [pod administrator](https://wiki.diasporafoundation.org/Installation), your help is welcome!
+To keep diaspora\* growing and improving we need all help we can get. Whether you can contribute [code](https://wiki.diasporafoundation.org/Getting_started_with_contributing), [ideas](https://wiki.diasporafoundation.org/How_we_communicate#Discourse), [translations](https://wiki.diasporafoundation.org/Contribute_translations), [bug reports](https://wiki.diasporafoundation.org/How_to_report_a_bug) or simply extend the community as a [helpful user](https://wiki.diasporafoundation.org/Welcoming_committee) or [pod administrator](https://wiki.diasporafoundation.org/Installation), your help is welcome!
+
+Everyone interacting in diaspora’s codebases, issue trackers, chat rooms, the wiki, and the Discourse is expected to follow the diaspora\* [code of conduct](/CODE_OF_CONDUCT.md).

 ## Security

-Found a security issue? Please disclose it responsibly. We have a team of developers listening to [security@diasporafoundation.org](mailto:security@diasporafoundation.org). The PGP fingerprint is [AB0D AB02 0FC5 D398 03AB 3CE1 6F70 243F 27AD 886A](http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x6F70243F27AD886A)
-
+Found a security issue? Please disclose it responsibly. We have a team of developers listening to [security@diasporafoundation.org](mailto:security@diasporafoundation.org). The PGP fingerprint is [AB0D AB02 0FC5 D398 03AB 3CE1 6F70 243F 27AD 886A](https://pgp.mit.edu/pks/lookup?op=get&search=0x6F70243F27AD886A).
--- a/2
+++ b/2
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
--- a/app/assets/config/manifest.js
+++ b/app/assets/config/manifest.js
@@ -0,0 +1,12 @@
+//= link contact-list.js
+//= link jquery3.js
+//= link jquery_ujs.js
+//= link main.js
+//= link jsxc.js
+//= link bookmarklet.js
+//= link mobile/bookmarklet.js
+//= link mobile/mobile.js
+//= link templates.js
+//= link error_pages.css
+//= link admin.css
+//= link rtl.css
--- a/app/assets/images/ajax-loader.gif
+++ b/app/assets/images/ajax-loader.gif
--- a/app/assets/images/branding/logos/asterisk_white_mobile.png
+++ b/app/assets/images/branding/logos/asterisk_white_mobile.png
--- a/app/assets/images/branding/logos/header-logo.png
+++ b/app/assets/images/branding/logos/header-logo.png
--- a/app/assets/images/branding/logos/header-logo_hover.png
+++ b/app/assets/images/branding/logos/header-logo_hover.png
--- a/app/assets/images/branding/logos/logo.png
+++ b/app/assets/images/branding/logos/logo.png
--- a/app/assets/images/branding/logos/logo_small.png
+++ b/app/assets/images/branding/logos/logo_small.png
--- a/app/assets/images/branding/logos/powered_by_diaspora.png
+++ b/app/assets/images/branding/logos/powered_by_diaspora.png
--- a/app/assets/images/branding/logos/white2x.png
+++ b/app/assets/images/branding/logos/white2x.png
--- a/app/assets/images/buttons/liberapay-button.svg
+++ b/app/assets/images/buttons/liberapay-button.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="83" height="30">
+  <rect id="back" fill="#f6c915" x="1" y=".5" width="82" height="29" rx="4"/>
+  <svg viewBox="0 0 80 80" height="16" width="16" x="7" y="7">
+    <g transform="translate(-78.37-208.06)" fill="#1a171b">
+      <path d="m104.28 271.1c-3.571 0-6.373-.466-8.41-1.396-2.037-.93-3.495-2.199-4.375-3.809-.88-1.609-1.308-3.457-1.282-5.544.025-2.086.313-4.311.868-6.675l9.579-40.05 11.69-1.81-10.484 43.44c-.202.905-.314 1.735-.339 2.489-.026.754.113 1.421.415 1.999.302.579.817 1.044 1.546 1.395.729.353 1.747.579 3.055.679l-2.263 9.278"/>
+      <path d="m146.52 246.14c0 3.671-.604 7.03-1.811 10.07-1.207 3.043-2.879 5.669-5.01 7.881-2.138 2.213-4.702 3.935-7.693 5.167-2.992 1.231-6.248 1.848-9.767 1.848-1.71 0-3.42-.151-5.129-.453l-3.394 13.651h-11.162l12.52-52.19c2.01-.603 4.311-1.143 6.901-1.622 2.589-.477 5.393-.716 8.41-.716 2.815 0 5.242.428 7.278 1.282 2.037.855 3.708 2.024 5.02 3.507 1.307 1.484 2.274 3.219 2.904 5.205.627 1.987.942 4.11.942 6.373m-27.378 15.461c.854.202 1.91.302 3.167.302 1.961 0 3.746-.364 5.355-1.094 1.609-.728 2.979-1.747 4.111-3.055 1.131-1.307 2.01-2.877 2.64-4.714.628-1.835.943-3.858.943-6.071 0-2.161-.479-3.998-1.433-5.506-.956-1.508-2.615-2.263-4.978-2.263-1.61 0-3.118.151-4.525.453l-5.28 21.948"/>
+    </g>
+  </svg>
+  <text fill="#1a171b" text-anchor="middle" font-family="Helvetica Neue,Helvetica,Arial,sans-serif" font-weight="700" font-size="14" x="50" y="20">Donate</text>
+</svg>
--- a/app/assets/images/dandelion.jpg
+++ b/app/assets/images/dandelion.jpg
--- a/app/assets/images/favicon.ico
+++ b/app/assets/images/favicon.ico
--- a/app/assets/images/fonts/Roboto-Bold.ttf
+++ b/app/assets/images/fonts/Roboto-Bold.ttf
--- a/app/assets/images/fonts/Roboto-Light.ttf
+++ b/app/assets/images/fonts/Roboto-Light.ttf
--- a/app/assets/images/fonts/Roboto-Regular.ttf
+++ b/app/assets/images/fonts/Roboto-Regular.ttf
--- a/app/assets/images/fonts/diaspora-custom.ttf
+++ b/app/assets/images/fonts/diaspora-custom.ttf
--- a/app/assets/images/fonts/svg-icons/compose_mobile.svg
+++ b/app/assets/images/fonts/svg-icons/compose_mobile.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   viewBox="0 0 744.09448819 1052.3622047"
+   height="40px"
+   width="40px">
+  <g
+     style="display:inline"
+     id="layer1"
+     transform="matrix(4.9383994,0,0,5.2618096,-1527.6262,-2214.8726)">
+    <path
+       id="path3511"
+       d="m 278.125,520.93362 0,-100 79.0625,0.0138 c 43.48437,0.008 81.17062,0.36221 83.74721,0.7881 3.3747,0.55781 6.95755,2.85698 12.8125,8.22198 l 8.12779,7.44764 0,16.13926 0,16.13926 -10,0 -10,0 -0.0158,-10.3125 -0.0157,-10.3125 -6.77054,-5.9375 -6.77057,-5.9375 -66.3387,0 -66.33869,0 0,83.75 0,83.75 24.54911,0 24.54912,0 -0.77696,6.5625 c -0.47778,4.0355 -1.59948,7.16416 -2.91302,8.125 -1.57019,1.14856 -10.18586,1.5625 -32.52216,1.5625 l -30.38609,0 0,-100 z m 75.01385,98.75856 c -0.95897,-0.59267 0.76874,-9.48251 5.61079,-28.86997 l 6.99644,-28.01359 39.00196,-39.14467 c 21.45108,-21.52956 40.5209,-39.95144 42.37738,-40.9375 1.87165,-0.99411 6.78352,-1.79283 11.02537,-1.79283 l 7.64993,0 12.71105,12.39542 12.71105,12.39542 0,12.61571 0,12.6157 -39.44885,39.44886 -39.44886,39.44885 -19.28755,4.7892 c -18.3445,4.55503 -36.89916,6.90323 -39.89871,5.0494 z m 33.55295,-18.06936 c 3.68049,-0.97963 6.89841,-1.98775 7.15094,-2.24027 0.25252,-0.25253 -3.66299,-4.55375 -8.70115,-9.55828 l -9.16028,-9.09915 -2.11015,8.40052 c -2.09814,8.35273 -2.09435,8.41733 0.66474,11.35425 3.24463,3.45376 3.41414,3.46969 12.1559,1.14293 z m 66.1351,-79.11794 -5.26283,-5.36242 -24.7019,24.67873 -24.70189,24.67874 5.26282,5.36243 5.26282,5.36242 24.70191,-24.67873 24.70189,-24.67875 -5.26282,-5.36242 z"
+       style="fill:#fefefe"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
--- a/app/assets/images/header-bg-long.jpg
+++ b/app/assets/images/header-bg-long.jpg
--- a/app/assets/images/header-bg.png
+++ b/app/assets/images/header-bg.png
--- a/app/assets/images/icons/mail_grey.png
+++ b/app/assets/images/icons/mail_grey.png
--- a/app/assets/images/icons/mail_grey_hover.png
+++ b/app/assets/images/icons/mail_grey_hover.png
--- a/app/assets/images/icons/notifications_grey.png
+++ b/app/assets/images/icons/notifications_grey.png
--- a/app/assets/images/icons/notifications_grey_hover.png
+++ b/app/assets/images/icons/notifications_grey_hover.png
--- a/app/assets/images/img/glyphicons-halflings-blue.png
+++ b/app/assets/images/img/glyphicons-halflings-blue.png
--- a/app/assets/images/img/glyphicons-halflings-red.png
+++ b/app/assets/images/img/glyphicons-halflings-red.png
--- a/app/assets/images/landing/cog.png
+++ b/app/assets/images/landing/cog.png
--- a/app/assets/images/landing/pen_write.png
+++ b/app/assets/images/landing/pen_write.png
--- a/app/assets/images/landing/smiley_laughing.png
+++ b/app/assets/images/landing/smiley_laughing.png
--- a/app/assets/images/mobile/arrow-left.png
+++ b/app/assets/images/mobile/arrow-left.png
--- a/app/assets/images/mobile/arrow-right.png
+++ b/app/assets/images/mobile/arrow-right.png
--- a/app/assets/images/mobile/arrow_down_small.png
+++ b/app/assets/images/mobile/arrow_down_small.png
--- a/app/assets/images/mobile/arrow_up_small.png
+++ b/app/assets/images/mobile/arrow_up_small.png
--- a/app/assets/images/mobile/camera.png
+++ b/app/assets/images/mobile/camera.png
--- a/app/assets/images/mobile/check_yes_ok.png
+++ b/app/assets/images/mobile/check_yes_ok.png
--- a/app/assets/images/mobile/compose_mobile.png
+++ b/app/assets/images/mobile/compose_mobile.png
--- a/app/assets/images/mobile/deletelabel.png
+++ b/app/assets/images/mobile/deletelabel.png
--- a/app/assets/images/mobile/hatched-light.jpg
+++ b/app/assets/images/mobile/hatched-light.jpg
--- a/app/assets/images/mobile/heart_mobile_grey.png
+++ b/app/assets/images/mobile/heart_mobile_grey.png
--- a/app/assets/images/mobile/heart_mobile_red.png
+++ b/app/assets/images/mobile/heart_mobile_red.png
--- a/app/assets/images/mobile/mail_white.png
+++ b/app/assets/images/mobile/mail_white.png
--- a/app/assets/images/mobile/menu.png
+++ b/app/assets/images/mobile/menu.png
--- a/app/assets/images/mobile/notifications_white.png
+++ b/app/assets/images/mobile/notifications_white.png
--- a/app/assets/images/mobile/pencil_mobile_grey.png
+++ b/app/assets/images/mobile/pencil_mobile_grey.png
--- a/app/assets/images/mobile/pencil_mobile_grey_active.png
+++ b/app/assets/images/mobile/pencil_mobile_grey_active.png
--- a/app/assets/images/mobile/reshare_mobile.png
+++ b/app/assets/images/mobile/reshare_mobile.png
--- a/app/assets/images/mobile/reshare_mobile_active.png
+++ b/app/assets/images/mobile/reshare_mobile_active.png
--- a/app/assets/images/social-media-logos/Readme.txt
+++ b/app/assets/images/social-media-logos/Readme.txt
--- a/app/assets/images/social-media-logos/facebook-16x16.png
+++ b/app/assets/images/social-media-logos/facebook-16x16.png
--- a/app/assets/images/social-media-logos/facebook-24x24.png
+++ b/app/assets/images/social-media-logos/facebook-24x24.png
--- a/app/assets/images/social-media-logos/facebook-32x32.png
+++ b/app/assets/images/social-media-logos/facebook-32x32.png
--- a/app/assets/images/social-media-logos/tumblr-16x16.png
+++ b/app/assets/images/social-media-logos/tumblr-16x16.png
--- a/app/assets/images/social-media-logos/tumblr-24x24.png
+++ b/app/assets/images/social-media-logos/tumblr-24x24.png
--- a/app/assets/images/social-media-logos/tumblr-32x32.png
+++ b/app/assets/images/social-media-logos/tumblr-32x32.png
--- a/app/assets/images/social-media-logos/twitter-16x16.png
+++ b/app/assets/images/social-media-logos/twitter-16x16.png
--- a/app/assets/images/social-media-logos/twitter-24x24.png
+++ b/app/assets/images/social-media-logos/twitter-24x24.png
--- a/app/assets/images/social-media-logos/twitter-32x32.png
+++ b/app/assets/images/social-media-logos/twitter-32x32.png
--- a/app/assets/images/social-media-logos/wordpress-16x16.png
+++ b/app/assets/images/social-media-logos/wordpress-16x16.png
--- a/app/assets/images/social-media-logos/wordpress-24x24.png
+++ b/app/assets/images/social-media-logos/wordpress-24x24.png
--- a/app/assets/images/social-media-logos/wordpress-32x32.png
+++ b/app/assets/images/social-media-logos/wordpress-32x32.png
--- a/app/assets/images/static-loader.png
+++ b/app/assets/images/static-loader.png
--- a/app/assets/images/user/uma.jpg
+++ b/app/assets/images/user/uma.jpg
--- a/app/assets/images/user/wolf.jpg
+++ b/app/assets/images/user/wolf.jpg
--- a/app/assets/javascripts/api/authorization_page.js
+++ b/app/assets/javascripts/api/authorization_page.js
@@ -0,0 +1,5 @@
+$(document).ready(function() {
+  $("#js-app-logo").on("error", function() {
+    $(this).attr("src", ImagePaths.get("user/default.png"));
+  });
+});
--- a/app/assets/javascripts/app/app.js
+++ b/app/assets/javascripts/app/app.js
@@ -14,7 +14,7 @@
 //= require_tree ./collections
 //= require_tree ./views

-//= require perfect-scrollbar
+//= require perfect-scrollbar/perfect-scrollbar.jquery

 var app = {
  collections: {},
@@ -46,25 +46,22 @@ var app = {
    app.router = new app.Router();

    this.setupDummyPreloads();
-    this.setupFacebox();
    this.setupUser();
+    this.setupAspects();
    this.setupHeader();
    this.setupBackboneLinks();
    this.setupGlobalViews();
    this.setupDisabledLinks();
+    this.setupForms();
+    this.setupAjaxErrorRedirect();
  },

  hasPreload : function(prop) {
    return !!(window.gon.preloads && window.gon.preloads[prop]); //returning boolean variable so that parsePreloads, which cleans up properly is used instead
  },

-  setPreload : function(prop, val) {
-    window.gon.preloads = window.gon.preloads || {};
-    window.gon.preloads[prop] = val;
-  },
-
  parsePreload : function(prop) {
-      if(!app.hasPreload(prop)) { return }
+      if(!app.hasPreload(prop)) { return; }

      var preload = window.gon.preloads[prop];
      delete window.gon.preloads[prop]; //prevent dirty state across navigates
@@ -82,45 +79,46 @@ var app = {
    app.currentUser = app.user(window.gon.user) || new app.models.User();
  },

+  setupAspects: function() {
+    app.aspects = new app.collections.Aspects(app.currentUser.get("aspects"));
+  },
+
  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();
    }
  },

-  setupFacebox: function() {
-    $.facebox.settings.closeImage = ImagePaths.get('facebox/closelabel.png');
-    $.facebox.settings.loadingImage = ImagePaths.get('facebox/loading.gif');
-    $.facebox.settings.opacity = 0.75;
-  },
-
  setupBackboneLinks: function() {
    Backbone.history.start({pushState: true});

    // there's probably a better way to do this...
    $(document).on("click", "a[rel=backbone]", function(evt){
+      if (!(app.stream && /^\/(?:stream|activity|aspects|public|mentions|likes)/.test(app.stream.basePath()))) {
+        // We aren't on a regular stream page
+        return;
+      }
+
      evt.preventDefault();
      var link = $(this);
+      $("html, body").animate({scrollTop: 0});

-      $(".stream_title").text(link.text());
-      app.router.navigate(link.attr("href").substring(1) ,true);
+      // app.router.navigate doesn't tell us if it changed the page,
+      // 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();
    });
  },

  setupGlobalViews: function() {
    app.hovercard = new app.views.Hovercard();
-    $('.aspect_membership_dropdown').each(function(){
-      new app.views.AspectMembership({el: this});
-    });
    app.sidebar = new app.views.Sidebar();
-  },
-
-  /* mixpanel wrapper function */
-  instrument : function(type, name, object, callback) {
-    if(!window.mixpanel) { return }
-    window.mixpanel[type](name, object, callback);
+    app.backToTop = new app.views.BackToTop({el: $(document)});
+    app.flashMessages = new app.views.FlashMessages({el: $("#flash-container")});
  },

  setupDisabledLinks: function() {
@@ -128,6 +126,36 @@ var app = {
      event.preventDefault();
    });
  },
+
+  setupForms: function() {
+    // add placeholder support for old browsers
+    $("input, textarea").placeholder();
+
+    // init autosize plugin
+    autosize($("textarea"));
+
+    // setup remote forms
+    $(document).on("ajax:success", "form[data-remote]", function() {
+      $(this).clearForm();
+      $(this).focusout();
+    });
+  },
+
+  setupAjaxErrorRedirect: function() {
+    var self = this;
+    // Binds the global ajax event. To prevent this, add
+    // preventGlobalErrorHandling: true
+    // to the settings of your ajax calls
+    $(document).ajaxError(function(evt, jqxhr, settings) {
+      if(jqxhr.status === 401 && !settings.preventGlobalErrorHandling) {
+        self._changeLocation(Routes.newUserSession());
+      }
+    });
+  },
+
+  _changeLocation: function(href) {
+    window.location.assign(href);
+  }
 };

 $(function() {
--- a/app/assets/javascripts/app/collections/aspect_memberships.js
+++ b/app/assets/javascripts/app/collections/aspect_memberships.js
@@ -1,6 +1,10 @@
 // @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later

 app.collections.AspectMemberships = Backbone.Collection.extend({
-  model: app.models.AspectMembership
+  model: app.models.AspectMembership,
+
+  findByAspectId: function(id) {
+    return this.find(function(membership) { return membership.belongsToAspect(id); });
+  }
 });
 // @license-end
--- a/app/assets/javascripts/app/collections/aspect_selections.js
+++ b/app/assets/javascripts/app/collections/aspect_selections.js
@@ -0,0 +1,31 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
+app.collections.AspectSelections = Backbone.Collection.extend({
+  model: app.models.AspectSelection,
+
+  selectedGetAttribute: function(attribute) {
+    return _.pluck(_.filter(this.toJSON(), function(a) {
+      return a.selected;
+    }), attribute);
+  },
+
+  allSelected: function() {
+    return this.length === _.filter(this.toJSON(), function(a) { return a.selected; }).length;
+  },
+
+  selectAll: function() {
+    this.map(function(a) { a.set({"selected": true}); });
+  },
+
+  deselectAll: function() {
+    this.map(function(a) { a.set({"selected": false}); });
+  },
+
+  toSentence: function() {
+    var separator = Diaspora.I18n.t("comma") + " ";
+    var pattern = new RegExp(Diaspora.I18n.t("comma") + "\\s([^" + Diaspora.I18n.t("comma") + "]+)$");
+    return this.selectedGetAttribute("name").join(separator).replace(pattern, " " + Diaspora.I18n.t("and") + " $1")
+      || Diaspora.I18n.t("my_aspects");
+  }
+});
+// @license-end
--- a/app/assets/javascripts/app/collections/aspects.js
+++ b/app/assets/javascripts/app/collections/aspects.js
@@ -1,29 +1,7 @@
 // @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later

 app.collections.Aspects = Backbone.Collection.extend({
-  model: app.models.AspectSelection,
-
-  selectedAspects: function(attribute){
-    return _.pluck(_.filter(this.toJSON(), function(a){
-              return a.selected;
-      }), attribute);
-  },
-
-  allSelected: function(){
-    return this.length === _.filter(this.toJSON(), function(a){ return a.selected; }).length;
-  },
-
-  selectAll: function(){
-    this.map(function(a){ a.set({ 'selected' : true })} );
-  },
-
-  deselectAll: function(){
-    this.map(function(a){ a.set({ 'selected' : false })} );
-  },
-
-  toSentence: function(){
-    var separator = Diaspora.I18n.t("comma") + ' ';
-    return this.selectedAspects('name').join(separator).replace(/,\s([^,]+)$/, ' ' + Diaspora.I18n.t("and") + ' $1') || Diaspora.I18n.t("my_aspects");
-  }
+  model: app.models.Aspect,
+  url: "/aspects"
 });
 // @license-end
--- a/app/assets/javascripts/app/collections/comments.js
+++ b/app/assets/javascripts/app/collections/comments.js
@@ -2,19 +2,20 @@

 app.collections.Comments = Backbone.Collection.extend({
  model: app.models.Comment,
-  url: function() { return _.result(this.post, 'url') + '/comments'; },
+  url: function() {
+      return _.result(this.post, "url") + "/comments";
+  },

  initialize : function(models, options) {
    this.post = options.post;
  },

-  make : function(text){
+  make : function(text) {
    var self = this;
-
-    var comment = new app.models.Comment({text: text });
+    var comment = new app.models.Comment({ "text": text });

    var deferred = comment.save({}, {
-      url: '/posts/'+this.post.id+'/comments',
+      url: "/posts/"+ this.post.id +"/comments",
      success: function() {
        comment.set({author: app.currentUser.toJSON(), parent: self.post });
        self.add(comment);
--- a/app/assets/javascripts/app/collections/notifications.js
+++ b/app/assets/javascripts/app/collections/notifications.js
@@ -0,0 +1,115 @@
+app.collections.Notifications = Backbone.Collection.extend({
+  model: app.models.Notification,
+  // URL parameter
+  /* eslint-disable camelcase */
+  url: Routes.notifications({per_page: 10, page: 1}),
+  /* eslint-enable camelcase */
+  page: 2,
+  perPage: 5,
+  unreadCount: 0,
+  unreadCountByType: {},
+  timeout: 300000, // 5 minutes
+
+  initialize: function() {
+    this.fetch();
+    setInterval(this.pollNotifications.bind(this), this.timeout);
+    Diaspora.BrowserNotification.requestPermission();
+  },
+
+  pollNotifications: function() {
+    var unreadCountBefore = this.unreadCount;
+    this.fetch();
+
+    this.once("finishedLoading", function() {
+      if (unreadCountBefore < this.unreadCount) {
+        Diaspora.BrowserNotification.spawnNotification(
+          Diaspora.I18n.t("notifications.new_notifications", {count: this.unreadCount}));
+      }
+    }, this);
+  },
+
+  fetch: function(options) {
+    options = options || {};
+    options.remove = false;
+    options.merge = true;
+    options.parse = true;
+    Backbone.Collection.prototype.fetch.apply(this, [options]);
+  },
+
+  fetchMore: function() {
+    var hasMoreNotifications = (this.page * this.perPage) <= this.length;
+    // There are more notifications to load on the current page
+    if (hasMoreNotifications) {
+      this.page++;
+      // URL parameter
+      /* eslint-disable camelcase */
+      var route = Routes.notifications({per_page: this.perPage, page: this.page});
+      /* eslint-enable camelcase */
+      this.fetch({url: route, pushBack: true});
+    }
+  },
+
+  /**
+   * Adds new models to the collection at the end or at the beginning of the collection and
+   * then fires an event for each model of the collection. It will fire a different event
+   * based on whether the models were added at the end (typically when the scroll triggers to load more
+   * notifications) or at the beginning (new notifications have been added to the front of the list).
+   */
+  set: function(items, options) {
+    options = options || {};
+    options.at = options.pushBack ? this.length : 0;
+
+    // Retreive back the new created models
+    var models = [];
+    var accu = function(model) { models.push(model); };
+    this.on("add", accu);
+    Backbone.Collection.prototype.set.apply(this, [items, options]);
+    this.off("add", accu);
+
+    if (options.pushBack) {
+      models.forEach(function(model) { this.trigger("pushBack", model); }.bind(this));
+    } else {
+      // Fires events in the reverse order so that the first event is prepended in first position
+      models.reverse();
+      models.forEach(function(model) { this.trigger("pushFront", model); }.bind(this));
+    }
+    this.trigger("finishedLoading");
+  },
+
+  parse: function(response) {
+    this.unreadCount = response.unread_count;
+    this.unreadCountByType = response.unread_count_by_type;
+
+    return _.map(response.notification_list, function(item) {
+      /* eslint-disable new-cap */
+      var model = new this.model(item);
+      /* eslint-enable new-cap */
+      model.on("userChangedUnreadStatus", this.onChangedUnreadStatus.bind(this));
+      model.on("change:unread", function() { this.trigger("update"); }.bind(this));
+      return model;
+    }.bind(this));
+  },
+
+  setAllRead: function() {
+    this.forEach(function(model) { model.setRead(); });
+  },
+
+  setRead: function(guid) {
+    this.find(function(model) { return model.guid === guid; }).setRead();
+  },
+
+  setUnread: function(guid) {
+    this.find(function(model) { return model.guid === guid; }).setUnread();
+  },
+
+  onChangedUnreadStatus: function(model) {
+    if (model.get("unread") === true) {
+      this.unreadCount++;
+      this.unreadCountByType[model.get("type")]++;
+    } else {
+      this.unreadCount = Math.max(this.unreadCount - 1, 0);
+      this.unreadCountByType[model.get("type")] = Math.max(this.unreadCountByType[model.get("type")] - 1, 0);
+    }
+    this.trigger("update");
+  }
+});
--- a/app/assets/javascripts/app/collections/pods.js
+++ b/app/assets/javascripts/app/collections/pods.js
@@ -0,0 +1,10 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+app.collections.Pods = Backbone.Collection.extend({
+  model: app.models.Pod,
+
+  comparator: function(model) {
+    var host = model.get("host") || "";
+    return host.toLowerCase();
+  }
+});
+// @license-end
--- a/app/assets/javascripts/app/collections/posts.js
+++ b/app/assets/javascripts/app/collections/posts.js
@@ -5,4 +5,3 @@ app.collections.Posts = Backbone.Collection.extend({
  url : "/posts"
 });
 // @license-end
-
--- a/app/assets/javascripts/app/collections/reshares.js
+++ b/app/assets/javascripts/app/collections/reshares.js
@@ -2,7 +2,9 @@

 app.collections.Reshares = Backbone.Collection.extend({
  model: app.models.Reshare,
-  url : "/reshares"
+
+  initialize: function(models, options) {
+    this.url = "/posts/" + options.post.id + "/reshares";
+  }
 });
 // @license-end
-
--- a/app/assets/javascripts/app/collections/tag_followings.js
+++ b/app/assets/javascripts/app/collections/tag_followings.js
@@ -12,7 +12,7 @@ app.collections.TagFollowings = Backbone.Collection.extend({
    var name = model.name || model.get("name");
    if(!this.any(
        function(tagFollowing){
-          return tagFollowing.get("name") === name; 
+          return tagFollowing.get("name") === name;
        })) {
      Backbone.Collection.prototype.create.apply(this, arguments);
    }
--- a/app/assets/javascripts/app/helpers/handlebars-helpers.js
+++ b/app/assets/javascripts/app/helpers/handlebars-helpers.js
@@ -42,15 +42,15 @@ Handlebars.registerHelper('linkToPerson', function(context, block) {
 });

 // relationship indicator for profile page
-Handlebars.registerHelper('sharingMessage', function(person) {
-  var i18n_scope = 'people.helper.is_not_sharing';
+Handlebars.registerHelper("sharingMessage", function(person) {
+  var i18nScope = "people.helper.is_not_sharing";
  var icon = "circle";
  if( person.is_sharing ) {
-    i18n_scope = 'people.helper.is_sharing';
-    icon = "entypo check";
+    i18nScope = "people.helper.is_sharing";
+    icon = "entypo-check";
  }

-  var title = Diaspora.I18n.t(i18n_scope, {name: person.name});
+  var title = Diaspora.I18n.t(i18nScope, {name: _.escape(person.name)});
  var html = '<span class="sharing_message_container" title="'+title+'" data-placement="bottom">'+
             '  <i id="sharing_message" class="'+icon+'"></i>'+
             '</span>';
@@ -60,11 +60,8 @@ Handlebars.registerHelper('sharingMessage', function(person) {

 // allow hovercards for users that are not the current user.
 // returns the html class name used to trigger hovercards.
-Handlebars.registerHelper('hovercardable', function(person) {
-  if( app.currentUser.get('guid') !== person.guid ) {
-    return 'hovercardable';
-  }
-  return '';
+Handlebars.registerHelper("hovercardable", function(person) {
+  return app.currentUser.get("guid") === person.guid ? "" : "hovercardable";
 });

 Handlebars.registerHelper('personImage', function(person, size, imageClass) {
@@ -78,10 +75,11 @@ Handlebars.registerHelper('personImage', function(person, size, imageClass) {
  size = ( !_.isString(size) ) ? "small" : size;
  imageClass = ( !_.isString(imageClass) ) ? size : imageClass;

-  return _.template('<img src="<%= src %>" class="avatar <%= img_class %>" title="<%= title %>" alt="<%= title %>" />')({
-    'src': avatar[size],
-    'img_class': imageClass,
-    'title': _.escape(name)
+  return _.template("<img src=\"<%= src %>\" class=\"<%= imageClass %>\" " +
+      "title=\"<%= title %>\" alt=\"<%= title %>\" />")({
+    src: avatar[size],
+    imageClass: imageClass + " avatar img-responsive center-block",
+    title: _.escape(name)
  });
 });

@@ -118,9 +116,9 @@ Handlebars.registerHelper("isCurrentProfilePage", function(id, diasporaHandle, o
 });

 Handlebars.registerHelper('aspectMembershipIndicator', function(contact,in_aspect) {
-  if(!app.aspect || !app.aspect.get('id')) return '<div class="aspect_membership_dropdown placeholder"></div>';
+  if(!app.aspect || !app.aspect.get('id')) return '<div class="aspect-membership-dropdown placeholder"></div>';

-  var html = '<i class="entypo ';
+  var html = "<i class=\"entypo-";
  if( in_aspect === 'in_aspect' ) {
    html += 'circled-cross contact_remove-from-aspect" ';
    html += 'title="' + Diaspora.I18n.t('contacts.remove_contact') + '" ';
--- a/app/assets/javascripts/app/helpers/locations.js
+++ b/app/assets/javascripts/app/helpers/locations.js
@@ -0,0 +1,25 @@
+(function() {
+  app.helpers.locations = {
+    getTiles: function() {
+      // If the mapbox option is enabled in the diaspora.yml, the mapbox tiles with the podmin's credentials are used.
+      if (gon.appConfig.map.mapbox.enabled) {
+        return L.tileLayer("https://api.mapbox.com/styles/v1/{style}/tiles/256/{z}/{x}/{y}?access_token={accessToken}", {
+          accessToken: gon.appConfig.map.mapbox.access_token,
+          style: gon.appConfig.map.mapbox.style,
+          attribution: "Map data &copy; <a href='http://openstreetmap.org'>OpenStreetMap</a> contributors, " +
+                       "<a href='http://creativecommons.org/licenses/by-sa/2.0/''>CC-BY-SA</a>, " +
+                       "Imagery © <a href='https://www.mapbox.com'>Mapbox</a>",
+          maxZoom: 18
+        });
+      }
+
+      // maptiles from the Heidelberg University are used by default.
+      return L.tileLayer("http://korona.geog.uni-heidelberg.de/tiles/roads/x={x}&y={y}&z={z}", {
+        attribution: "Map data &copy; <a href='http://openstreetmap.org'>OpenStreetMap</a> contributors, " +
+                     "rendering <a href='http://giscience.uni-hd.de/'>" +
+                     "GIScience Research Group @ Heidelberg University</a>",
+        maxZoom: 18
+      });
+    }
+  };
+})();
--- a/app/assets/javascripts/app/helpers/modal_helper.js
+++ b/app/assets/javascripts/app/helpers/modal_helper.js
@@ -0,0 +1,14 @@
+(function(){
+  app.helpers.showModal = function(id){
+    $(id).modal();
+    var modalBody = $(id).find(".modal-body");
+
+    var url = $(id).attr("href");
+
+    modalBody.load(url, function(){
+      $(id).find("#modalWaiter").remove();
+      autosize($("textarea", modalBody));
+      $(id).trigger("modal:loaded");
+    });
+  };
+})();
--- a/app/assets/javascripts/app/helpers/open_graph.js
+++ b/app/assets/javascripts/app/helpers/open_graph.js
@@ -1,12 +0,0 @@
-// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
-
-(function(){
-  app.helpers.openGraph = {
-    html : function (open_graph_cache) {
-      if (!open_graph_cache) { return ""; }
-      return '<img src="' + open_graph_cache.image + '" />';
-    },
-  };
-})();
-// @license-end
-
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .1
 .4