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

Merge branch 'next-minor' into develop

Browse source
This commit is contained in:
Benjamin Neff 2017-02-12 21:01:36 +01:00
commit 2f9a032b38
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -14,6 +14,7 @@
## Refactor ## Refactor
* Unify link colors [#7318](https://github.com/diaspora/diaspora/pull/7318) * Unify link colors [#7318](https://github.com/diaspora/diaspora/pull/7318)
* Increase time to wait before showing the hovercard [#7319](https://github.com/diaspora/diaspora/pull/7319)
## Bug fixes ## Bug fixes
* Fix path to `bundle` in `script/server` [#7281](https://github.com/diaspora/diaspora/pull/7281) * Fix path to `bundle` in `script/server` [#7281](https://github.com/diaspora/diaspora/pull/7281)

2
app/assets/javascripts/app/views/hovercard_view.js
View file

@ -91,7 +91,7 @@ app.views.Hovercard = app.views.Base.extend({
this.parent = el; this.parent = el;
this._positionHovercard(); this._positionHovercard();
this._populateHovercard(); this._populateHovercard();
}, 700), }, 1000),
_populateHovercard: function() { _populateHovercard: function() {
var href = this.href(); var href = this.href();