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

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

Browse Source
This commit is contained in:
yflory 2017-05-23 14:50:42 +02:00
commit 38bd6b3808
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
customize.dist/translations/messages.js
View File

@ -481,7 +481,7 @@ define(function () {
'# CryptPad\'s Zero Knowledge collaborative code editor\n', '# CryptPad\'s Zero Knowledge collaborative code editor\n',
'\n', '\n',
'* What you type here is encrypted so only people who have the link can access it.\n', '* What you type here is encrypted so only people who have the link can access it.\n',
'* You can choose the programming language to highlight and the UI color scheme in the upper right.' '* You can choose the programming language to highlight and the UI color scheme in the upper right.'
].join(''); ].join('');
out.slideInitialState = [ out.slideInitialState = [

9
rpc.js
View File

@ -376,6 +376,11 @@ var updateLimits = function (config, publicKey, cb) {
var defaultLimit = typeof(config.defaultStorageLimit) === 'number'? var defaultLimit = typeof(config.defaultStorageLimit) === 'number'?
config.defaultStorageLimit: DEFAULT_LIMIT; config.defaultStorageLimit: DEFAULT_LIMIT;
var userId;
if (publicKey) {
userId = unescapeKeyCharacters(publicKey);
}
var body = JSON.stringify({ var body = JSON.stringify({
domain: config.domain, domain: config.domain,
subdomain: config.subdomain subdomain: config.subdomain
@ -404,8 +409,8 @@ var updateLimits = function (config, publicKey, cb) {
var json = JSON.parse(str); var json = JSON.parse(str);
limits = json; limits = json;
var l; var l;
if (publicKey) { if (userId) {
var limit = limits[publicKey]; var limit = limits[userId];
l = limit && typeof limit.limit === "number" ? l = limit && typeof limit.limit === "number" ?
[limit.limit, limit.plan, limit.note] : [defaultLimit, '', '']; [limit.limit, limit.plan, limit.note] : [defaultLimit, '', ''];
} }