web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'soon' into staging

Browse Source
This commit is contained in:
ansuz 2020-03-10 11:59:52 -04:00
commit f2729ee9e2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/common/outer/async-store.js
View File

@ -1661,7 +1661,9 @@ define([
// If the owner was not is the pad metadata, check if it is a friend. // If the owner was not is the pad metadata, check if it is a friend.
// We'll contact the first owner for whom we know the mailbox // We'll contact the first owner for whom we know the mailbox
/* // XXX check mailbox in our contacts is not compatible with the new "mute pad" feature /* // TODO decide whether we want to re-enable this feature for our own contacts
// communicate the exception to users that 'muting' won't apply to friends
check mailbox in our contacts is not compatible with the new "mute pad" feature
var owners = data.owners; var owners = data.owners;
if (!owner && Array.isArray(owners)) { if (!owner && Array.isArray(owners)) {
var friends = store.proxy.friends || {}; var friends = store.proxy.friends || {};