Unverified Commit d0313756 authored by Benjamin Neff's avatar Benjamin Neff
Browse files

Merge branch 'release/0.7.4.0'

parents b23696bb aadd64b0
Loading
Loading
Loading
Loading
+18 −0
Original line number Diff line number Diff line
# 0.7.4.0

## Refactor
* Don't print a warning when starting the server outside a Git repo [#7712](https://github.com/diaspora/diaspora/pull/7712)
* Make script/server work on readonly filesystems [#7719](https://github.com/diaspora/diaspora/pull/7719)
* Add camo paths to the robots.txt [#7726](https://github.com/diaspora/diaspora/pull/7726)

## Bug fixes
* Prevent duplicate mention notifications when the post is received twice [#7721](https://github.com/diaspora/diaspora/pull/7721)
* Fixed a compatiblitiy issue with non-diaspora\* webfingers [#7718](https://github.com/diaspora/diaspora/pull/7718)
* Don't retry federation for accounts without a valid public key [#7717](https://github.com/diaspora/diaspora/pull/7717)
* Fix stream generation for tagged posts with many followed tags [#7715](https://github.com/diaspora/diaspora/pull/7715)
* Fix incomplete Occitan date localizations [#7731](https://github.com/diaspora/diaspora/pull/7731)

## Features
* Add basic html5 audio/video embedding support [#6418](https://github.com/diaspora/diaspora/pull/6418)
* Add the back-to-top button to all pages [#7729](https://github.com/diaspora/diaspora/pull/7729)

# 0.7.3.1

Re-updating the German translations to fix some UX issues that were introduced by recent translation efforts.
+8 −6
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ gem "unicorn-worker-killer", "0.4.4"

# Federation

gem "diaspora_federation-json_schema", "0.2.3"
gem "diaspora_federation-rails", "0.2.3"
gem "diaspora_federation-json_schema", "0.2.4"
gem "diaspora_federation-rails", "0.2.4"

# API and JSON

@@ -26,7 +26,7 @@ gem "json-schema", "2.8.0"

# Authentication

gem "devise", "4.3.0"
gem "devise", "4.4.1"
gem "devise_lastseenable", "0.0.6"

# Captcha
@@ -122,11 +122,13 @@ source "https://rails-assets.org" do
  gem "rails-assets-perfect-scrollbar",                   "0.6.16"
end

gem "markdown-it-html5-embed", "1.0.0"

# Localization

gem "http_accept_language", "2.1.1"
gem "i18n-inflector-rails", "1.0.7"
gem "rails-i18n",           "5.0.4"
gem "rails-i18n",           "5.1.1"

# Mail

@@ -186,7 +188,7 @@ gem "typhoeus", "1.3.0"
# Views

gem "gon",                     "6.1.0"
gem "hamlit",                  "2.8.4"
gem "hamlit",                  "2.8.6"
gem "mobile-fu",               "1.4.0"
gem "rails-timeago",           "2.16.0"
gem "will_paginate",           "3.1.6"
@@ -292,7 +294,7 @@ group :test do
  gem "timecop",            "0.9.1"
  gem "webmock",            "3.0.1", require: false

  gem "diaspora_federation-test", "0.2.3"
  gem "diaspora_federation-test", "0.2.4"

  # Coverage
  gem "coveralls", "0.8.21", require: false
+33 −30
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ GEM
      tins (~> 1.6)
    crack (0.4.3)
      safe_yaml (~> 1.0.0)
    crass (1.0.2)
    crass (1.0.3)
    cucumber (2.4.0)
      builder (>= 2.1.2)
      cucumber-core (~> 1.5.0)
@@ -156,7 +156,7 @@ GEM
      railties (>= 4, < 5.2)
    cucumber-wire (0.0.1)
    database_cleaner (1.6.1)
    devise (4.3.0)
    devise (4.4.1)
      bcrypt (~> 3.0)
      orm_adapter (~> 0.1)
      railties (>= 4.1.0, < 5.2)
@@ -166,18 +166,18 @@ GEM
      devise
      rails (>= 3.0.4)
    diaspora-prosody-config (0.0.7)
    diaspora_federation (0.2.3)
    diaspora_federation (0.2.4)
      faraday (>= 0.9.0, < 0.15.0)
      faraday_middleware (>= 0.10.0, < 0.13.0)
      nokogiri (~> 1.6, >= 1.6.8)
      typhoeus (~> 1.0)
      valid (~> 1.0)
    diaspora_federation-json_schema (0.2.3)
    diaspora_federation-rails (0.2.3)
    diaspora_federation-json_schema (0.2.4)
    diaspora_federation-rails (0.2.4)
      actionpack (>= 4.2, < 6)
      diaspora_federation (= 0.2.3)
    diaspora_federation-test (0.2.3)
      diaspora_federation (= 0.2.3)
      diaspora_federation (= 0.2.4)
    diaspora_federation-test (0.2.4)
      diaspora_federation (= 0.2.4)
      fabrication (~> 2.16)
      uuid (~> 2.3, >= 2.3.8)
    diff-lcs (1.3)
@@ -187,7 +187,7 @@ GEM
    entypo-rails (3.0.0)
      railties (>= 4.1, < 6)
    equalizer (0.0.11)
    erubi (1.6.1)
    erubi (1.7.1)
    eslintrb (2.1.0)
      execjs
      multi_json (>= 1.3)
@@ -217,7 +217,7 @@ GEM
      http-cookie (~> 1.0.0)
    faraday_middleware (0.12.2)
      faraday (>= 0.7.4, < 1.0)
    ffi (1.9.18)
    ffi (1.9.23)
    fixture_builder (0.5.0)
      activerecord (>= 2)
      activesupport (>= 2)
@@ -273,7 +273,7 @@ GEM
    guard-rubocop (1.3.0)
      guard (~> 2.0)
      rubocop (~> 0.20)
    haml (5.0.3)
    haml (5.0.4)
      temple (>= 0.8.0)
      tilt
    haml_lint (0.26.0)
@@ -282,7 +282,7 @@ GEM
      rake (>= 10, < 13)
      rubocop (>= 0.49.0)
      sysexits (~> 1.1)
    hamlit (2.8.4)
    hamlit (2.8.6)
      temple (>= 0.8.0)
      thor
      tilt
@@ -306,7 +306,8 @@ GEM
    httparty (0.15.6)
      multi_xml (>= 0.5.2)
    httpclient (2.8.3)
    i18n (0.8.6)
    i18n (0.9.5)
      concurrent-ruby (~> 1.0)
    i18n-inflector (2.6.7)
      i18n (>= 0.4.1)
    i18n-inflector-rails (1.0.7)
@@ -359,7 +360,7 @@ GEM
      multi_json (~> 1.10)
    logging-rails (0.6.0)
      logging (>= 1.8)
    loofah (2.1.1)
    loofah (2.2.0)
      crass (~> 1.0.2)
      nokogiri (>= 1.5.9)
    lumberjack (1.0.12)
@@ -367,6 +368,7 @@ GEM
      systemu (~> 2.6.2)
    mail (2.6.6)
      mime-types (>= 1.16, < 4)
    markdown-it-html5-embed (1.0.0)
    markerb (1.1.0)
    memoizable (0.4.2)
      thread_safe (~> 0.3, >= 0.3.1)
@@ -377,7 +379,7 @@ GEM
    mini_magick (4.8.0)
    mini_mime (0.1.4)
    mini_portile2 (2.3.0)
    minitest (5.10.3)
    minitest (5.11.3)
    mobile-fu (1.4.0)
      rack-mobile-detect
      rails
@@ -473,7 +475,7 @@ GEM
      byebug (~> 9.1)
      pry (~> 0.10)
    public_suffix (3.0.0)
    rack (2.0.3)
    rack (2.0.4)
    rack-cors (1.0.1)
    rack-google-analytics (1.2.0)
      actionpack
@@ -487,12 +489,12 @@ GEM
      multi_json (>= 1.3.6)
      rack (>= 1.1)
    rack-piwik (0.3.0)
    rack-protection (2.0.0)
    rack-protection (2.0.1)
      rack
    rack-rewrite (1.5.1)
    rack-ssl (1.4.1)
      rack
    rack-test (0.7.0)
    rack-test (0.8.3)
      rack (>= 1.0, < 3)
    rails (5.1.4)
      actioncable (= 5.1.4)
@@ -561,9 +563,9 @@ GEM
      nokogiri (>= 1.6)
    rails-html-sanitizer (1.0.3)
      loofah (~> 2.0)
    rails-i18n (5.0.4)
      i18n (~> 0.7)
      railties (~> 5.0)
    rails-i18n (5.1.1)
      i18n (>= 0.7, < 2)
      railties (>= 5.0, < 6)
    rails-timeago (2.16.0)
      actionpack (>= 3.1)
      activesupport (>= 3.1)
@@ -576,7 +578,7 @@ GEM
    rainbow (2.2.2)
      rake
    raindrops (0.19.0)
    rake (12.1.0)
    rake (12.3.0)
    rb-fsevent (0.10.2)
    rb-inotify (0.9.10)
      ffi (>= 0.5.0, < 2)
@@ -712,7 +714,7 @@ GEM
      unf (~> 0.1.0)
    typhoeus (1.3.0)
      ethon (>= 0.9.0)
    tzinfo (1.2.3)
    tzinfo (1.2.5)
      thread_safe (~> 0.1)
    uglifier (3.2.0)
      execjs (>= 0.3.0, < 3)
@@ -757,7 +759,7 @@ GEM
    will_paginate (3.1.6)
    xpath (2.1.0)
      nokogiri (~> 1.3)
    yard (0.9.9)
    yard (0.9.12)

PLATFORMS
  ruby
@@ -780,12 +782,12 @@ DEPENDENCIES
  cucumber-api-steps (= 0.13)
  cucumber-rails (= 1.5.0)
  database_cleaner (= 1.6.1)
  devise (= 4.3.0)
  devise (= 4.4.1)
  devise_lastseenable (= 0.0.6)
  diaspora-prosody-config (= 0.0.7)
  diaspora_federation-json_schema (= 0.2.3)
  diaspora_federation-rails (= 0.2.3)
  diaspora_federation-test (= 0.2.3)
  diaspora_federation-json_schema (= 0.2.4)
  diaspora_federation-rails (= 0.2.4)
  diaspora_federation-test (= 0.2.4)
  entypo-rails (= 3.0.0)
  eye (= 0.9.2)
  factory_girl_rails (= 4.8.0)
@@ -801,7 +803,7 @@ DEPENDENCIES
  guard-rspec (= 4.7.3)
  guard-rubocop (= 1.3.0)
  haml_lint (= 0.26.0)
  hamlit (= 2.8.4)
  hamlit (= 2.8.6)
  handlebars_assets (= 0.23.2)
  http_accept_language (= 2.1.1)
  i18n-inflector-rails (= 1.0.7)
@@ -815,6 +817,7 @@ DEPENDENCIES
  json-schema-rspec (= 0.0.4)
  leaflet-rails (= 1.2.0)
  logging-rails (= 0.6.0)
  markdown-it-html5-embed (= 1.0.0)
  markerb (= 1.1.0)
  mini_magick (= 4.8.0)
  minitest
@@ -866,7 +869,7 @@ DEPENDENCIES
  rails-assets-markdown-it-sup (= 1.0.0)!
  rails-assets-perfect-scrollbar (= 0.6.16)!
  rails-controller-testing (= 1.0.2)
  rails-i18n (= 5.0.4)
  rails-i18n (= 5.1.1)
  rails-timeago (= 2.16.0)
  rb-fsevent (= 0.10.2)
  rb-inotify (= 0.9.10)
+29 −0
Original line number Diff line number Diff line
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later

(function(){
  app.helpers.allowedEmbedsMime = function(mimetype) {
    var v = document.createElement(mimetype[1]);
    return v.canPlayType && v.canPlayType(mimetype[0]) !== "";
  };

  app.helpers.textFormatter = function(text, mentions) {
    mentions = mentions ? mentions : [];

@@ -83,6 +88,30 @@

    // Bootstrap table markup
    md.renderer.rules.table_open = function () { return "<table class=\"table table-striped\">\n"; };

    var html5medialPlugin = window.markdownitHTML5Embed;
    md.use(html5medialPlugin, {html5embed: {
      inline: false,
      autoAppend: true,
      renderFn: function handleBarsRenderFn(parsed, mediaAttributes) {
        var attributes = mediaAttributes[parsed.mediaType];
        return HandlebarsTemplates["media-embed_tpl"]({
          mediaType: parsed.mediaType,
          attributes: attributes,
          mimetype: parsed.mimeType,
          sourceURL: parsed.url,
          title: parsed.title,
          fallback: parsed.fallback,
          needsCover: parsed.mediaType === "video"
        });
      },
      attributes: {
        "audio": "controls preload=none",
        "video": "preload=none"
      },
      isAllowedMimeType: app.helpers.allowedEmbedsMime
    }});

    return md.render(text);
  };
})();
+6 −6
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ app.pages.SinglePostViewer = app.views.Base.extend({

  subviews: {
    "#single-post-content": "singlePostContentView",
    '#single-post-interactions' : 'singlePostInteractionsView'
    "#single-post-interactions": "singlePostInteractionsView"
  },

  initialize: function() {
Loading