Permalink
Commits on Jun 10, 2017
  1. Merge remote-tracking branch 'upstream/master'

    Conflicts:
    	Gemfile
    	Gemfile.lock
    dmorley committed Jun 10, 2017
Commits on May 29, 2017
Commits on May 21, 2017
  1. Bump nokogiri

    closes #7458
    SuperTux88 committed with denschub May 20, 2017
  2. Add admin account username to NodeInfo metadata

    Fixes #7421
    
    closes #7447
    SuperTux88 committed with denschub May 10, 2017
  3. Add NodeInfo 2.0 support

    SuperTux88 committed with denschub May 10, 2017
  4. Bump rubocop

    Use old style for Style/PercentLiteralDelimiters for now. Maybe we can
    change this in the future, because the ruby style guide suggests to use
    `[]` (which is also the new default for rubocop).
    
    closes #7443#
    SuperTux88 committed with denschub May 4, 2017
  5. Bump pronto and all pronto-runners

    Also add `require: false` everywhere.
    SuperTux88 committed with denschub May 4, 2017
Commits on May 15, 2017
  1. Use guid instead of id at permalink and in SPV

    This changes links from /posts/:id to /posts/:guid where the links are
    not clicked very often. ID search is faster than guid search so we can't
    change it everywhere, but these links are not very useful for clicking,
    but can be used for easier guid look up.
    
    closes #7453
    cmrd-senya committed with SuperTux88 May 15, 2017
Commits on May 13, 2017
Commits on May 11, 2017
  1. Don't raise when the public key of a person is "broken"

    Breaking a public key of a person can be used to "block" receiving posts
    from this person on the pod. So we should handle that case better and
    not just trigger many retries for something that will fail again.
    
    closes #7448
    SuperTux88 committed May 10, 2017
  2. Remove rails_admin

    This is now broken since more than half a year, so I think we can just
    remove it.
    
    Podmins shouldn't use this anyway, because it does bad things, like
    replacing NULL with an empty string when editing something. If we really
    need an admin interface for something, we should add it to our own admin
    panel at /admins/dashboard.
    
    Fixes #7027 and #6413
    
    closes #7440
    SuperTux88 committed May 3, 2017
Commits on May 5, 2017
  1. Fix first comment in mobile view with french locale

    Fixes #7438. The regression has possibly been introduced by #7207.
    
    closes #7441
    svbergerem committed with SuperTux88 May 3, 2017
Commits on May 3, 2017
  1. Bump diaspora_federation

    The previous version logged the encrypted private messages of the new
    protocol, which only makes the logfiles bigger without any benefit,
    because it's encrypted anyway ...
    
    closes #7435
    SuperTux88 committed May 1, 2017
  2. bump rails-timeago

    Here we also set autoDispose to false. This is an option that was introduced
    sometime after our last bump. Default is true and it disposes timeago object
    if it is not in DOM. But that is the way we initialize timeago objects, therefore
    if we have autoDispose=true then they will be disposed before they inserted in DOM.
    So by using autoDispose=false we enforce previous behavior that worked fine for us.
    cmrd-senya committed with svbergerem Apr 10, 2017
  3. fix a typo

    cmrd-senya committed with svbergerem Apr 10, 2017
Commits on Apr 26, 2017
Commits on Apr 23, 2017
Commits on Apr 18, 2017
Commits on Apr 11, 2017
  1. Start 0.6.6.0 cycle

    [ci skip]
    denschub committed Apr 11, 2017
Commits on Apr 7, 2017
Commits on Apr 6, 2017
Commits on Apr 5, 2017
  1. Improve csp for a better cloudflare support

    closes #7367
    Amadren committed with SuperTux88 Mar 15, 2017
Commits on Apr 2, 2017
  1. Remove unused cucumber step

    "should see JSON"
    
    closes #7410
    cmrd-senya committed with svbergerem Apr 1, 2017