blitzwing/cryptpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

Browse source
This commit is contained in:
yflory 2019-09-09 18:47:46 +02:00
commit 29075b7898
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
www/common/notify.js
View file

@ -7,7 +7,7 @@ define(['/api/config'], function (ApiConfig) {
var document = window.document;
var isSupported = Module.isSupported = function () {
return typeof(window.Notification) === 'function' && window.location.protocol === 'https:';
return typeof(window.Notification) === 'function' && window.isSecureContext;
};
var hasPermission = Module.hasPermission = function () {

5
www/common/outer/async-store.js
View file

@ -642,8 +642,13 @@ define([
href: href,
channel: channel,
title: data.driveReadmeTitle,
owners: [ store.proxy.edPublic ],
};
Store.addPad(clientId, fileData, cb);
}, {
metadata: {
owners: [ store.proxy.edPublic ],
},
});
});
};