Merge branch 'staging' into team

This commit is contained in:
yflory
2019-09-06 15:46:19 +02:00
20 changed files with 833 additions and 442 deletions

View File

@@ -563,7 +563,7 @@ define([
roHref: roHref,
atime: now,
ctime: now,
title: title || Hash.getDefaultName(Hash.parsePadUrl(href)),
title: title || UserObject.getDefaultName(Hash.parsePadUrl(href)),
};
};
@@ -933,6 +933,8 @@ define([
var p = Hash.parsePadUrl(href);
var h = p.hashData;
if (title.trim() === "") { title = UserObject.getDefaultName(p); }
if (AppConfig.disableAnonymousStore && !store.loggedIn) { return void cb(); }
if (p.type === "debug") { return void cb(); }

View File

@@ -189,7 +189,6 @@ proxy.mailboxes = {
box.queue.push(msg);
}
};
Crypto = Crypto;
if (!Crypto.Mailbox) {
return void console.error("chainpad-crypto is outdated and doesn't support mailboxes.");
}

View File

@@ -695,7 +695,7 @@ define([
// Fix creation time
if (!el.ctime) { el.ctime = el.atime; }
// Fix title
if (!el.title) { el.title = Hash.getDefaultName(parsed); }
if (!el.title) { el.title = exp.getDefaultName(parsed); }
// Fix channel
if (!el.channel) {
try {