Permalink
Commits on Aug 22, 2016
  1. @denschub

    Merge branch 'next-minor' into develop

    denschub committed Aug 22, 2016
  2. @denschub

    Merge branch 'release/0.6.0.0' into next-minor

    denschub committed Aug 22, 2016
  3. @SuperTux88 @denschub

    Remove started sharing notifications where the contact doesn't exist

    The same as #7009 but now all of them ;)
    SuperTux88 committed with denschub Aug 22, 2016
  4. @svbergerem @denschub
  5. @svbergerem @denschub
  6. @denschub

    Merge branch 'next-minor' into develop

    denschub committed Aug 22, 2016
  7. @denschub

    Merge branch 'release/0.6.0.0' into next-minor

    denschub committed Aug 22, 2016
  8. @denschub

    Merge pull request #7018 from SuperTux88/fix-reshare-metadata

    Fix regressions from #6998
    denschub committed Aug 22, 2016
  9. @denschub

    Merge pull request #7017 from SuperTux88/bump-diaspora_federation

    bump diaspora_federation
    denschub committed Aug 22, 2016
Commits on Aug 21, 2016
  1. @denschub

    Merge branch 'next-minor' into develop

    denschub committed Aug 21, 2016
  2. @denschub

    Merge branch 'release/0.6.0.0' into next-minor

    denschub committed Aug 21, 2016
  3. @denschub

    Rename 'stable' to 'next-minor'

    denschub committed Aug 21, 2016
  4. @SuperTux88

    Fix regressions from #6998

    * fixed old reshares of reshares
    * fixed deleted root of a reshare
    SuperTux88 committed Aug 21, 2016
  5. @SuperTux88

    bump diaspora_federation

    SuperTux88 committed Aug 21, 2016
  6. @denschub

    Merge branch 'stable' into develop

    denschub committed Aug 21, 2016
  7. @denschub

    Merge branch 'release/0.6.0.0' into stable

    denschub committed Aug 21, 2016
  8. @denschub
  9. @denschub

    Prepare 0.7.0.0 cycle

    [ci skip]
    denschub committed Aug 21, 2016
  10. @denschub

    Prepare 0.6.1.0 cycle

    [ci skip]
    denschub committed Aug 21, 2016
  11. @denschub

    Merge pull request #7009 from SuperTux88/fix-started-sharing-notifica…

    …tions-without-contact
    
    Remove started sharing notifications where the contact doesn't exist
    denschub committed Aug 21, 2016
  12. @denschub

    Merge pull request #7016 from svbergerem/fix-7015

    Fix misplaced publisher prefill on tags page
    denschub committed Aug 21, 2016
  13. @denschub

    Merge pull request #7014 from svbergerem/remove-stream-title

    Remove stream title from main stream
    denschub committed Aug 21, 2016
  14. @denschub

    Merge pull request #7013 from svbergerem/fix-header-badges-small-screens

    Move notifications and conversations links in collapsed header on small devices
    denschub committed Aug 21, 2016
  15. @denschub

    Merge pull request #7012 from svbergerem/fix-stream-shortcuts-small-s…

    …creens
    
    Fix stream shortcuts on small screens
    denschub committed Aug 21, 2016
  16. @denschub

    Merge pull request #7011 from SuperTux88/fix-author-not-lowercase

    Use Person.by_account_identifier to find the author
    denschub committed Aug 21, 2016
  17. @denschub

    Merge pull request #7010 from SuperTux88/refactor-pod-uri-parse

    Use https for the pod_uri if require_ssl is true
    denschub committed Aug 21, 2016
  18. @svbergerem

    Fix misplaced publisher prefill on tags page

    svbergerem committed Aug 21, 2016
  19. @svbergerem

    Remove stream title from main stream

    svbergerem committed Aug 21, 2016
  20. @svbergerem

    Move notifications and conversations links in collapsed header on sma…

    …ll devices
    svbergerem committed Aug 21, 2016
  21. @svbergerem

    Fix stream shortcuts on small screens

    svbergerem committed Aug 21, 2016
  22. @SuperTux88

    Use Person.by_account_identifier to find the author

    SuperTux88 committed Aug 21, 2016
Commits on Aug 20, 2016
  1. @SuperTux88

    Use https for the pod_uri if require_ssl is true

    SuperTux88 committed Aug 20, 2016
  2. @SuperTux88

    Remove started sharing notifications where the contact doesn't exist

    Before #6873 we deleted contacts when someone blocks a person, but we
    didn't drop the notification for the started sharing event. In #6864
    we try to get the contact for the notification, which is not there
    anymore.
    
    So we need to remove the notifications for the contacts that don't exit
    anymore.
    SuperTux88 committed Aug 20, 2016
Commits on Aug 18, 2016
  1. @jhass

    Merge pull request #7005 from SuperTux88/fix-reshare-delete

    don't add the root author to the subscribers if the root post was deleted
    jhass committed on GitHub Aug 18, 2016
  2. @SuperTux88

    don't add the root author to the subscribers if the root post was del…

    …eted
    SuperTux88 committed Aug 18, 2016