aboutsummaryrefslogtreecommitdiffstats
path: root/view/js
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-05-02 17:28:49 +0200
committerMario <mario@mariovavti.com>2020-05-02 17:28:49 +0200
commit104c45f6e6550f723f976bd071bb0bd8e9aafce9 (patch)
treeac4a6190e24d763da04e846c2356b45957bc3faa /view/js
parent1ac2b93fd8b297561dc9fe5132a7d21450b6885e (diff)
parentf4a71db42dec1daa5d3cbf305372bdf47b4add5f (diff)
downloadvolse-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/js')
-rw-r--r--view/js/main.js3
1 files changed, 2 insertions, 1 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