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-06-22 15:52:31 +02:00
parent 13288ee18b 852c028822
commit a11befaa0f
44 changed files with 1095 additions and 1458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
www/pad/main.js
View File

@@ -307,7 +307,8 @@ define([
hjson[3] = {
metadata: {
users: UserList.userData,
defaultTitle: Title.defaultTitle
defaultTitle: Title.defaultTitle,
type: 'pad'
}
};
if (!initializing) {
@@ -451,7 +452,7 @@ define([
var titleCfg = { getHeadingText: getHeadingText };
Title = Cryptpad.createTitle(titleCfg, realtimeOptions.onLocal, Cryptpad);
Metadata = Cryptpad.createMetadata(UserList, Title);
Metadata = Cryptpad.createMetadata(UserList, Title, null, Cryptpad);
var configTb = {
displayed: ['title', 'useradmin', 'spinner', 'lag', 'state', 'share', 'userlist', 'newpad', 'limit', 'upgrade'],