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-05-16 00:37:06 +02:00
commit e463397122
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -22,6 +22,7 @@
## Refactor ## Refactor
* Remove rails\_admin [#7440](https://github.com/diaspora/diaspora/pull/7440) * Remove rails\_admin [#7440](https://github.com/diaspora/diaspora/pull/7440)
* Use guid instead of id at permalink and in SPV [#7453](https://github.com/diaspora/diaspora/pull/7453)
## Bug fixes ## Bug fixes
* Make photo upload button hover text translatable [#7429](https://github.com/diaspora/diaspora/pull/7429) * Make photo upload button hover text translatable [#7429](https://github.com/diaspora/diaspora/pull/7429)

6
app/assets/templates/single-post-viewer/single-post-content_tpl.jst.hbs
View file

@ -39,11 +39,11 @@
{{/if}} {{/if}}
<span class="post-time"> <span class="post-time">
{{#if root}} {{#if root}}
<a href="/posts/{{root.id}}"> <a href="/posts/{{root.guid}}">
<time datetime="{{root.created_at}}" title="{{localTime root.created_at}}" /> <time datetime="{{root.created_at}}" title="{{localTime root.created_at}}" />
</a> </a>
{{else}} {{else}}
<a href="/posts/{{id}}"> <a href="/posts/{{guid}}">
<time datetime="{{created_at}}" title="{{localTime created_at}}" /> <time datetime="{{created_at}}" title="{{localTime created_at}}" />
</a> </a>
{{/if}} {{/if}}
@ -91,7 +91,7 @@
</span> </span>
<div class="post-context"> <div class="post-context">
<span class="post-time"> <span class="post-time">
<a href="/posts/{{id}}"> <a href="/posts/{{guid}}">
<time datetime="{{created_at}}" title="{{localTime created_at}}" /> <time datetime="{{created_at}}" title="{{localTime created_at}}" />
</a> </a>
</span> </span>

2
app/assets/templates/stream-element_tpl.jst.hbs
View file

@ -24,7 +24,7 @@
<time class="timeago" data-original-title="{{{localTime created_at}}}" datetime="{{created_at}}" /> <time class="timeago" data-original-title="{{{localTime created_at}}}" datetime="{{created_at}}" />
</a> </a>
<a href="/posts/{{id}}" class="permalink" title="{{t "stream.permalink"}}"> <a href="/posts/{{guid}}" class="permalink" title="{{t "stream.permalink"}}">
<i class="entypo-link"></i> <i class="entypo-link"></i>
</a> </a>
{{/if}} {{/if}}