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:
Steffen van Bergerem 2015-09-05 16:12:00 +02:00
commit 426f55e685
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Changelog.md
View file

@ -70,6 +70,15 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
* Bigger mobile publisher [#6261](https://github.com/diaspora/diaspora/pull/6261) * Bigger mobile publisher [#6261](https://github.com/diaspora/diaspora/pull/6261)
* Backend information panel & health checks for known pods [#6290](https://github.com/diaspora/diaspora/pull/6290) * Backend information panel & health checks for known pods [#6290](https://github.com/diaspora/diaspora/pull/6290)
# 0.5.4.0
## Refactor
## Bug fixes
## Features
* Show spinner on initial stream load [#6384](https://github.com/diaspora/diaspora/pull/6384)
# 0.5.3.0 # 0.5.3.0
## Refactor ## Refactor

1
app/assets/javascripts/app/views/infinite_stream_view.js
View file

@ -13,6 +13,7 @@ app.views.InfScroll = app.views.Base.extend({
this.postViews = this.postViews || []; this.postViews = this.postViews || [];
this._resetPostFragments(); this._resetPostFragments();
this.showLoader();
this.bind("loadMore", this.fetchAndshowLoader, this); this.bind("loadMore", this.fetchAndshowLoader, this);
this.stream.bind("fetched", this.finishedLoading, this); this.stream.bind("fetched", this.finishedLoading, this);
this.stream.bind("allItemsLoaded", this.unbindInfScroll, this); this.stream.bind("allItemsLoaded", this.unbindInfScroll, this);