Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
commit
132b869827
|
@ -782,6 +782,18 @@ define([
|
|||
view: false
|
||||
};
|
||||
});
|
||||
// Add an history keeper user to show that we're never alone
|
||||
var hkId = Util.createRandomInteger();
|
||||
p.push({
|
||||
id: hkId,
|
||||
idOriginal: String(hkId),
|
||||
username: "History",
|
||||
indexUser: i,
|
||||
connectionId: Hash.createChannelId(),
|
||||
isCloseCoAuthoring:false,
|
||||
view: false
|
||||
});
|
||||
i++;
|
||||
if (!myUniqueOOId) { myUniqueOOId = String(myOOId) + i; }
|
||||
p.push({
|
||||
id: myUniqueOOId,
|
||||
|
@ -1309,6 +1321,8 @@ define([
|
|||
return;
|
||||
}
|
||||
|
||||
APP.onLocal(); // Add our data to the userlist
|
||||
|
||||
if (APP.history) {
|
||||
try {
|
||||
getEditor().asc_setRestriction(true);
|
||||
|
|
Loading…
Reference in New Issue