Merge pull request #6095 from AugierLe42e/openid

config/database.yml

.rvmrc_custom

.rvmrc.local

config/oidc_key.pem

# Mailing list stuff

config/email_offset

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!

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

gem "twitter",            "5.15.0"

gem "omniauth-wordpress", "0.2.2"

# OpenID Connect

gem "openid_connect", "0.8.3"

# Serializers

gem "active_model_serializers", "0.9.3"

# https://github.com/discourse/discourse/pull/238

gem "minitest"

gem "versionist", "1.4.1"

# Windows and OSX have an execjs compatible runtime built-in, Linux users should

# install Node.js or use "therubyracer".

#

  gem "database_cleaner" ,  "1.5.1"

  gem "selenium-webdriver", "2.47.1"

  gem "cucumber-api-steps", "0.13", require: false

  gem "json_spec", "1.1.4"

  # General helpers

  gem "factory_girl_rails", "4.5.0"

    ast (2.2.0)

    astrolabe (1.3.1)

      parser (~> 2.2)

    attr_required (1.0.0)

    autoprefixer-rails (6.2.2)

      execjs

      json

      jquery-rails

      railties

    bcrypt (3.1.10)

    bindata (2.1.0)

    bootstrap-sass (3.3.6)

      autoprefixer-rails (>= 5.2.1)

      sass (>= 3.3.4)

      gherkin (~> 2.12)

      multi_json (>= 1.7.5, < 2.0)

      multi_test (>= 0.1.2)

    cucumber-api-steps (0.13)

      cucumber (>= 1.2.1)

      jsonpath (>= 0.1.2)

      rspec (>= 2.12.0)

    cucumber-rails (1.4.2)

      capybara (>= 1.1.2, < 3)

      cucumber (>= 1.3.8, < 2)

    httparty (0.13.7)

      json (~> 1.8)

      multi_xml (>= 0.5.2)

    httpclient (2.7.1)

    i18n (0.7.0)

    i18n-inflector (2.6.7)

      i18n (>= 0.4.1)

      multi_json (>= 1.3)

      rake

    json (1.8.3)

    json-jwt (1.5.1)

      activesupport

      bindata

      multi_json (>= 1.3)

      securecompare

      url_safe_base64

    json-schema (2.5.2)

      addressable (~> 2.3.8)

    json_spec (1.1.4)

      multi_json (~> 1.0)

      rspec (>= 2.0, < 4.0)

    jsonpath (0.5.7)

      multi_json

    jwt (1.5.2)

    kaminari (0.16.3)

      actionpack (>= 3.0.0)

    open_graph_reader (0.6.1)

      faraday (~> 0.9.0)

      nokogiri (~> 1.6)

    openid_connect (0.8.3)

      activemodel

      attr_required (>= 0.0.5)

      json (>= 1.4.3)

      json-jwt (>= 0.5.5)

      rack-oauth2 (>= 1.0.0)

      swd (>= 0.1.2)

      tzinfo

      validate_email

      validate_url

      webfinger (>= 0.0.2)

    orm_adapter (0.5.0)

    parser (2.2.3.0)

      ast (>= 1.1, < 3.0)

      activesupport

    rack-mobile-detect (0.4.0)

      rack

    rack-oauth2 (1.2.1)

      activesupport (>= 2.3)

      attr_required (>= 0.0.5)

      httpclient (>= 2.4)

      multi_json (>= 1.3.6)

      rack (>= 1.1)

    rack-piwik (0.3.0)

    rack-pjax (0.8.0)

      nokogiri (~> 1.5)

    scss_lint (0.42.2)

      rainbow (~> 2.0)

      sass (~> 3.4.15)

    securecompare (1.0.0)

    selenium-webdriver (2.47.1)

      childprocess (~> 0.5)

      multi_json (~> 1.0)

      activesupport (>= 3.0)

      sprockets (>= 2.8, < 4.0)

    state_machine (1.2.0)

    swd (1.0.0)

      activesupport (>= 3)

      attr_required (>= 0.0.5)

      httpclient (>= 2.4)

      i18n

      json (>= 1.4.3)

    sysexits (1.2.0)

    systemu (2.6.5)

    terminal-table (1.5.2)

      kgio (~> 2.6)

      rack

      raindrops (~> 0.7)

    url_safe_base64 (0.2.2)

    uuid (2.3.8)

      macaddr (~> 1.0)

    valid (1.1.0)

    validate_email (0.1.6)

      activemodel (>= 3.0)

      mail (>= 2.2.5)

    validate_url (1.0.2)

      activemodel (>= 3.0.0)

      addressable

    versionist (1.4.1)

      activesupport (>= 3)

      railties (>= 3)

      yard (~> 0.7)

    warden (1.2.4)

      rack (>= 1.0)

    webfinger (1.0.1)

      activesupport

      httpclient (>= 2.4)

      multi_json

    webmock (1.22.3)

      addressable (>= 2.3.6)

      crack (>= 0.3.2)

    xml-simple (1.1.5)

    xpath (2.0.0)

      nokogiri (~> 1.3)

    yard (0.8.7.6)

PLATFORMS

  ruby

  carrierwave (= 0.10.0)

  compass-rails (= 2.0.5)

  configurate (= 0.3.1)

  cucumber-api-steps (= 0.13)

  cucumber-rails (= 1.4.2)

  database_cleaner (= 1.5.1)

  devise (= 3.5.3)

  jshintrb (= 0.3.0)

  json (= 1.8.3)

  json-schema (= 2.5.2)

  json_spec (= 1.1.4)

  leaflet-rails (= 0.7.4)

  logging-rails (= 0.5.0)

  markerb (= 1.1.0)

  omniauth-twitter (= 1.2.1)

  omniauth-wordpress (= 0.2.2)

  open_graph_reader (= 0.6.1)

  openid_connect (= 0.8.3)

  pg (= 0.18.4)

  pronto (= 0.5.3)

  pronto-haml (= 0.5.0)

  uglifier (= 2.7.2)

  unicorn (= 5.0.1)

  uuid (= 2.3.8)

  versionist (= 1.4.1)

  webmock (= 1.22.3)

  will_paginate (= 3.0.7)

$(document).ready(function() {

  $("#js-app-logo").error(function () {

    $(this).attr("src", ImagePaths.get("user/default.png"));

  });

});