Permalink
Commits on Feb 21, 2018
  1. Merge branch 'next-minor' into develop

    SuperTux88 committed Feb 21, 2018
  2. Prevent duplicate mention notifications when the post is received twice

    SuperTux88 committed Feb 21, 2018
    closes #7721
  3. piped bin/bundle commands to suppress warnings when run on readonly f…

    Brad Koehn authored and SuperTux88 committed Feb 19, 2018
    …ilesystems
    
    
    closes #7719
Commits on Feb 17, 2018
  1. Merge branch 'next-minor' into develop

    SuperTux88 committed Feb 17, 2018
  2. Add @nophantomjs tag to default cucumber profile

    cmrd-senya authored and SuperTux88 committed Sep 2, 2017
    Use this tag for tests which can't work with PhantomJS, but which we
    can run with Selenium using some other profile (not implemented here).
    
    closes #6418
  3. Support for embedding HTML5 media links

    cmrd-senya authored and SuperTux88 committed Sep 2, 2017
    Use markdown-it-html5-embed plugin so user can embed audio and
    video using the markdown link syntax []() in the HTML5 way.
  4. Bump devise

    svbergerem authored and SuperTux88 committed Feb 16, 2018
    closes #7716
  5. Bump hamlit

    svbergerem authored and SuperTux88 committed Feb 16, 2018
  6. Bump haml

    svbergerem authored and SuperTux88 committed Feb 16, 2018
Commits on Feb 10, 2018
  1. Merge branch 'next-minor' into develop

    denschub committed Feb 10, 2018
  2. Don't print a warning when starting the server outside a Git repo

    saveriomiroddi authored and denschub committed Feb 6, 2018
    Currently, git checks are performed on server start, even when outside a git
    repository.
    
    This commit verify the presence of a git repository (via `git status` exit
    code), and perform checks only if it exists.
    
    closes #7712
Commits on Feb 9, 2018
  1. Merge branch 'next-minor' into develop

    denschub committed Feb 9, 2018
  2. Merge branch 'master' into next-minor

    denschub committed Feb 9, 2018
  3. Merge branch 'hotfix/0.7.3.1'

    denschub committed Feb 9, 2018
Commits on Feb 8, 2018
  1. Merge branch 'next-minor' into develop

    SuperTux88 committed Feb 8, 2018
  2. Merge branch 'next-minor' of github.com:diaspora/diaspora into next-m…

    SuperTux88 committed Feb 8, 2018
    …inor
  3. Merge branch 'release/0.7.3.0'

    SuperTux88 committed Feb 8, 2018
Commits on Feb 3, 2018
  1. Merge branch 'next-minor' into develop

    denschub committed Feb 3, 2018
  2. Remove unnecessary quotes in database.yml.examle

    Flaburgan authored and denschub committed Feb 3, 2018
    [ci skip]
    
    closes #7711
Commits on Feb 1, 2018
  1. Merge branch 'next-minor' into develop

    denschub committed Feb 1, 2018
  2. Start 0.7.4.0 cycle

    denschub committed Feb 1, 2018
    [ci skip]
  3. Merge branch 'next-minor' into develop

    denschub committed Feb 1, 2018
  4. Send participation after receiving a public post

    SuperTux88 authored and denschub committed Jan 29, 2018
    This is to let the author of the post know, that this pod is interested
    in updates about this post.
    
    The sending user is only used to verify that the participation was sent
    from this pod, but lets use an admin/podmin account if available.
    
    closes #7708
  5. Fix post_message for posts without text

    SuperTux88 authored and denschub committed Jan 27, 2018
    fixes #7700
    closes #7706
  6. Retry Contact messages 20 time (about two weeks)

    SuperTux88 authored and denschub committed Jan 27, 2018
    closes #7705
  7. Start sending the blocking flag

    SuperTux88 authored and denschub committed Jan 27, 2018
  8. Remove participants limit for conversations

    SuperTux88 authored and denschub committed Jan 27, 2018
    The limit was added in 2012 to prevent spam, but since the participants
    need to be a mutual contact with the author nowadays, I don't think it's
    a spam problem anymore.
  9. Bump diaspora_federation

    SuperTux88 authored and denschub committed Jan 27, 2018
  10. Make mobile bookmarklet work the same way as with desktop UI

    SuperTux88 authored and denschub committed Jan 20, 2018
    This fixes that it fails when you call it without notes parameter.
    
    closes #7698