merge changes

This commit is contained in:
j 2020-05-09 18:41:21 +02:00
parent 978ee57e89
commit 12ad69aac9
2 changed files with 3 additions and 3 deletions

View file

@ -67,7 +67,7 @@
"canPlayVideo": {"guest": 1, "member": 1, "staff": 4, "admin": 4},
"canReadText": {"guest": 0, "member": 0, "staff": 1, "admin": 1},
"canRemoveItems": {"admin": true},
"canRemoveDocuments": {"staff": true, "admin": true},
"canRemoveDocuments": {"staff": false, "admin": true},
"canSeeAccessed": {"staff": true, "admin": true},
"canSeeAllTasks": {"staff": true, "admin": true},
"canSeeDebugMenu": {"staff": true, "admin": true},
@ -1244,7 +1244,7 @@
"footer": "-- https://leftove.rs/",
"prefix": "leftove.rs news -",
// E-mail address uses by the system (from)
"system": "system@maydayrooms.org"
"system": "system@leftove.rs"
},
"https": true,
"id": "leftovers",

View file

@ -116,7 +116,7 @@ pandora.ui.documentInfoView = function(data, isMixed) {
element: '<img>',
})
.attr({
src: '/documents/' + data.id + '/512p.jpg?' + data.modified
src: pandora.site.site.mediaprefix + '/documents/' + data.id + '/512p.jpg?' + data.modified
})
.css({
position: 'absolute',