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:
ansuz
2017-01-09 11:02:32 +01:00
parent 4902aebe77 6106f7d6ca
commit e8a87378aa
10 changed files with 194 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
customize.dist/application_config.js
View File

@@ -12,8 +12,8 @@ define(function() {
*/
config.notificationTimeout = 5000;
config.USE_FS_STORE = false;
config.USE_HOMEPAGE_TABLE = true;
config.USE_FS_STORE = true;
config.USE_HOMEPAGE_TABLE = false;
return config;
});

5
customize.dist/fsStore.js
View File

@@ -133,8 +133,11 @@ define([
}
};
var initialized = false;
var init = function (f, Cryptpad) {
if (!Cryptpad) { return; }
if (!Cryptpad || initialized) { return; }
initialized = true;
var hash = Cryptpad.getUserHash() || localStorage.FS_hash;
var secret = Cryptpad.getSecrets(hash);
var listmapConfig = {

2
customize.dist/messages.js
View File

@@ -95,7 +95,7 @@ define(['/customize/languageSelector.js',
$('[data-localization]').each(translateText);
$('#pad-iframe').contents().find('[data-localization]').each(translateText);
$('[data-localization-title]').each(translateTitle);
$('[data-localization-placeholder').each(translatePlaceholder);
$('[data-localization-placeholder]').each(translatePlaceholder);
$('#pad-iframe').contents().find('[data-localization-title]').each(translateTitle);
};