Permalink
Commits on Sep 19, 2016
  1. Merge branch 'hotfix/0.6.0.1'

    denschub committed Sep 19, 2016
  2. Init 0.6.0.1 hotfix

    denschub committed Sep 19, 2016
Commits on Aug 26, 2016
  1. Merge branch 'release/0.6.0.0'

    denschub committed Aug 26, 2016
Commits on Aug 22, 2016
  1. 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
  2. Merge pull request #7018 from SuperTux88/fix-reshare-metadata

    Fix regressions from #6998
    denschub committed Aug 22, 2016
  3. Merge pull request #7017 from SuperTux88/bump-diaspora_federation

    bump diaspora_federation
    denschub committed Aug 22, 2016
Commits on Aug 21, 2016
  1. Rename 'stable' to 'next-minor'

    denschub committed Aug 21, 2016
  2. Fix regressions from #6998

    * fixed old reshares of reshares
    * fixed deleted root of a reshare
    SuperTux88 committed Aug 21, 2016
  3. bump diaspora_federation

    SuperTux88 committed Aug 21, 2016
  4. 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
  5. Merge pull request #7016 from svbergerem/fix-7015

    Fix misplaced publisher prefill on tags page
    denschub committed Aug 21, 2016
  6. Merge pull request #7014 from svbergerem/remove-stream-title

    Remove stream title from main stream
    denschub committed Aug 21, 2016
  7. 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
  8. Merge pull request #7012 from svbergerem/fix-stream-shortcuts-small-s…

    …creens
    
    Fix stream shortcuts on small screens
    denschub committed Aug 21, 2016
  9. Merge pull request #7011 from SuperTux88/fix-author-not-lowercase

    Use Person.by_account_identifier to find the author
    denschub committed Aug 21, 2016
  10. 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
  11. Fix misplaced publisher prefill on tags page

    svbergerem committed Aug 21, 2016
  12. Remove stream title from main stream

    svbergerem committed Aug 21, 2016
  13. Move notifications and conversations links in collapsed header on sma…

    …ll devices
    svbergerem committed Aug 21, 2016
  14. Fix stream shortcuts on small screens

    svbergerem committed Aug 21, 2016
  15. Use Person.by_account_identifier to find the author

    SuperTux88 committed Aug 21, 2016
Commits on Aug 20, 2016
  1. Use https for the pod_uri if require_ssl is true

    SuperTux88 committed Aug 20, 2016
  2. 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. 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. don't add the root author to the subscribers if the root post was del…

    …eted
    SuperTux88 committed Aug 18, 2016
  3. add changelog entry for #6998 [ci skip]

    jhass committed Aug 18, 2016
  4. 6840 : meta tags update (#6998)

    * Adds a new metadata helper and methods to PostPresenter to have metas on post pages.
    
    * Adds tests to post controller to check correctness of metas
    
    * Add methods to PersonPresenter to have metas on profile pages
    
    * Correct meta data helper test
    
    * Update PersonPresenter, add test to PeopleController
    
    * Creates TagPresenter. Display tag metas on tag index page
    
    * Updata meta data helper spec
    
    * Not displaying bio as the description meta on profile page for now. Privacy concerns to be cleared.
    
    * Set meta info as hashes in presenters
    
    * Move original hardcoded metas info to config/defaults.yml
    
    * metas_tags include by default the general metas, update views
    
    * Update code style, clean views
    
    * Renames TagPresenter StreamTagPresenter, updates TagController spec
    
    * Add a default_metas entry to diaspora.yml.example
    
    * Align metas hash in presenters, refactor meta data helper
    
    * Use bio as description meta if user has a public profile
    
    * Rename StreamTagPresenter to TagStreamPresenter
    dhovart committed with jhass Aug 18, 2016
  5. Merge pull request #7003 from svbergerem/remove-services-swallowing-e…

    …rrors-specs
    
    Remove specs about services swallowing exceptions
    denschub committed Aug 18, 2016
  6. Remove specs about services swallowing exceptions

    svbergerem committed Aug 18, 2016
  7. Merge pull request #7001 from svbergerem/fix-conversation-recipient-s…

    …uggestions
    
    Fix conversations autoSuggest showing non-mutual contacts
    jhass committed Aug 18, 2016