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

Merge branch 'staging' into notifications

Browse Source
This commit is contained in:
yflory 2019-07-04 10:56:43 +02:00
commit b548d30afe
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
customize.dist/pages.js
View File

@ -103,7 +103,7 @@ define([
])*/ ])*/
]) ])
]), ]),
h('div.cp-version-footer', "CryptPad v2.24.0 (Yak)") h('div.cp-version-footer', "CryptPad v2.25.0 (Zebra)")
]); ]);
}; };

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "cryptpad", "name": "cryptpad",
"description": "realtime collaborative visual editor with zero knowlege server", "description": "realtime collaborative visual editor with zero knowlege server",
"version": "2.24.0", "version": "2.25.0",
"license": "AGPL-3.0+", "license": "AGPL-3.0+",
"repository": { "repository": {
"type": "git", "type": "git",

3
www/common/proxy-manager.js
View File

@ -252,6 +252,9 @@ define([
var obj = Env.folders[el].proxy.metadata || {}; var obj = Env.folders[el].proxy.metadata || {};
if (obj) { key = obj.title; } if (obj) { key = obj.title; }
} else { } else {
try {
el = JSON.parse(JSON.stringify(el));
} catch (e) { return undefined; }
userObject.getFilesRecursively(el, files); userObject.getFilesRecursively(el, files);
} }