nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Jonne Haß 2015-11-23 03:13:13 +01:00
commit 086931d745
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Changelog.md
View file

@ -86,10 +86,16 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
* Add permalink icon to stream elements [#6457](https://github.com/diaspora/diaspora/pull/6457) * Add permalink icon to stream elements [#6457](https://github.com/diaspora/diaspora/pull/6457)
* Move reshare count to interactions for stream elements [#6487](https://github.com/diaspora/diaspora/pull/6487) * Move reshare count to interactions for stream elements [#6487](https://github.com/diaspora/diaspora/pull/6487)
# 0.5.5.0 # 0.5.6.0
## Refactor ## Refactor
## Bug fixes
## Features
# 0.5.5.0
## Bug fixes ## Bug fixes
* Redirect to sign in page when a background request fails with 401 [#6496](https://github.com/diaspora/diaspora/pull/6496) * Redirect to sign in page when a background request fails with 401 [#6496](https://github.com/diaspora/diaspora/pull/6496)
* Correctly skip setting sidekiq logfile on Heroku [#6500](https://github.com/diaspora/diaspora/pull/6500) * Correctly skip setting sidekiq logfile on Heroku [#6500](https://github.com/diaspora/diaspora/pull/6500)
@ -98,8 +104,6 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
* Prevent participations being created for invalid interactions [#6552](https://github.com/diaspora/diaspora/pull/6552) * Prevent participations being created for invalid interactions [#6552](https://github.com/diaspora/diaspora/pull/6552)
* Improve federation for reshare related interactions [#6481](https://github.com/diaspora/diaspora/pull/6481) * Improve federation for reshare related interactions [#6481](https://github.com/diaspora/diaspora/pull/6481)
## Features
# 0.5.4.0 # 0.5.4.0
## Refactor ## Refactor