diff options
| author | Mario <mario@mariovavti.com> | 2020-05-02 17:28:49 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2020-05-02 17:28:49 +0200 |
| commit | 104c45f6e6550f723f976bd071bb0bd8e9aafce9 (patch) | |
| tree | ac4a6190e24d763da04e846c2356b45957bc3faa /view | |
| parent | 1ac2b93fd8b297561dc9fe5132a7d21450b6885e (diff) | |
| parent | f4a71db42dec1daa5d3cbf305372bdf47b4add5f (diff) | |
| download | volse-hubzilla-104c45f6e6550f723f976bd071bb0bd8e9aafce9.tar.gz volse-hubzilla-104c45f6e6550f723f976bd071bb0bd8e9aafce9.tar.bz2 volse-hubzilla-104c45f6e6550f723f976bd071bb0bd8e9aafce9.zip | |
Merge branch 'dev' into 'dev'
Display delayed posts on author's channel page
See merge request hubzilla/core!1854
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/main.js | 3 | ||||
| -rwxr-xr-x | view/tpl/conv_item.tpl | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/view/js/main.js b/view/js/main.js index 94fd940b2..5ba4282a6 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -88,7 +88,8 @@ $(document).ready(function() { wordSeparator : aStr['t16'], numbers : aStr['t17'], }; - + + jQuery.timeago.settings.allowFuture = true; if(typeof(window.SharedWorker) === 'undefined') { // notifications with multiple tabs open will not work very well in this scenario diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 340807d02..f48e88006 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -57,7 +57,7 @@ <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link u-url"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" ><bdi>{{$item.name}}</bdi></span></a>{{if $item.owner_url}} {{$item.via}} <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}"><bdi>{{$item.owner_name}}</bdi></span></a>{{/if}} </div> <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}"> - {{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i> {{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location p-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/if}}<span class="autotime" title="{{$item.isotime}}"><time class="dt-published" datetime="{{$item.isotime}}">{{$item.localtime}}</time>{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}} <i class="fa fa-pencil"></i>{{/if}} {{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}} + {{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i> {{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location p-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/if}}<span class="autotime" title="{{$item.isotime}}"><time class="dt-published" datetime="{{$item.isotime}}">{{$item.localtime}}</time>{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span> {{if $item.delayed}}<i class="fa fa-clock-o"></i>{{/if}}{{if $item.editedtime}} <i class="fa fa-pencil"></i>{{/if}} {{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}} </div> </div> {{if $item.divider}} |