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 2016-09-11 23:06:27 +02:00
commit b3b4ccd553
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -25,6 +25,7 @@
* Fixed missing sidebar background in the contacts tab [#7064](https://github.com/diaspora/diaspora/pull/7064) * Fixed missing sidebar background in the contacts tab [#7064](https://github.com/diaspora/diaspora/pull/7064)
* Fix tags URLs in hovercards [#7075](https://github.com/diaspora/diaspora/pull/7075) * Fix tags URLs in hovercards [#7075](https://github.com/diaspora/diaspora/pull/7075)
* Fix 500 in html requests for post interactions [#7085](https://github.com/diaspora/diaspora/pull/7085) * Fix 500 in html requests for post interactions [#7085](https://github.com/diaspora/diaspora/pull/7085)
* Remove whitespaces next to like link in stream [#7088](https://github.com/diaspora/diaspora/pull/7088)
## Features ## Features
* Deleted comments will be removed when loading more comments [#7045](https://github.com/diaspora/diaspora/pull/7045) * Deleted comments will be removed when loading more comments [#7045](https://github.com/diaspora/diaspora/pull/7045)

10
app/assets/templates/feedback_tpl.jst.hbs
View file

@ -18,11 +18,11 @@
<span>{{t "stream.like"}}</span> <span>{{t "stream.like"}}</span>
{{else}} {{else}}
<a href="#" class="like" rel='nofollow'> <a href="#" class="like" rel='nofollow'>
{{#if userLike}} {{~#if userLike~}}
{{t "stream.unlike"}} {{~t "stream.unlike"~}}
{{else}} {{~else~}}
{{t "stream.like"}} {{~t "stream.like"~}}
{{/if}} {{~/if~}}
</a> </a>
{{/if}} {{/if}}
· ·