Merge remote-tracking branch 'upstream/dev' into doco

This commit is contained in:
Andrew Manning
2017-08-24 18:57:52 +00:00
33 changed files with 906 additions and 66 deletions

View File

@@ -380,8 +380,9 @@ function NavUpdate() {
if($('#live-pubstream').length) { src = 'pubstream'; liveUpdate(); }
if($('#live-display').length) { src = 'display'; liveUpdate(); }
if($('#live-search').length) { src = 'search'; liveUpdate(); }
// if($('#live-cards').length) { src = 'cards'; liveUpdate(); }
if($('#live-photos').length) {
if($('#live-photos').length || $('#live-cards').length) {
if(liking) {
liking = 0;
window.location.href=window.location.href;

3
view/js/mod_cards.js Normal file
View File

@@ -0,0 +1,3 @@
$(document).ready( function() {
$(".autotime").timeago();
});