mirror of https://github.com/xwiki-labs/cryptpad
Merge branch 'security2' of git.xwikisas.com:xwiki-labs/cryptpad into security2
This commit is contained in:
yflory
commit
6b8d0c8bc7
|
|
@ -29,7 +29,7 @@
|
|||
"rangy": "rangy-release#~1.3.0",
|
||||
"json.sortify": "~2.1.0",
|
||||
"fabric.js": "fabric#~1.6.0",
|
||||
"hyperjson": "~1.3.1",
|
||||
"hyperjson": "~1.4.0",
|
||||
"textpatcher": "^1.3.0",
|
||||
"proxy-polyfill": "^0.1.5",
|
||||
"chainpad": "^0.3.0",
|
||||
|
|
|
|||
|
|
@ -14,24 +14,35 @@ module.exports = {
|
|||
* Examples are provided below
|
||||
*/
|
||||
|
||||
/*
|
||||
httpHeaders: {
|
||||
"Content-Security-Policy": [
|
||||
"default-src 'none'",
|
||||
"style-src 'unsafe-inline' 'self'",
|
||||
"script-src 'self' 'unsafe-eval' 'unsafe-inline'",
|
||||
"child-src 'self' cryptpad.fr *.cryptpad.fr",
|
||||
"font-src 'self'",
|
||||
"connect-src 'self' wss://cryptpad.fr",
|
||||
// data: is used by codemirror, (insecure remote) images are included by
|
||||
// users of the wysiwyg who embed photos in their pads
|
||||
"img-src data: *",
|
||||
].join('; '),
|
||||
|
||||
"X-XSS-Protection": "1; mode=block",
|
||||
"X-Content-Type-Options": "nosniff",
|
||||
// 'X-Frame-Options': 'SAMEORIGIN',
|
||||
},*/
|
||||
},
|
||||
|
||||
contentSecurity: [
|
||||
"default-src 'none'",
|
||||
"style-src 'unsafe-inline' 'self'",
|
||||
"script-src 'self'",
|
||||
"child-src 'self' cryptpad.fr *.cryptpad.fr",
|
||||
"font-src 'self'",
|
||||
"connect-src 'self' wss://cryptpad.fr",
|
||||
// data: is used by codemirror
|
||||
"img-src 'self' data:",
|
||||
].join('; '),
|
||||
|
||||
// CKEditor requires significantly more lax content security policy in order to function.
|
||||
padContentSecurity: [
|
||||
"default-src 'none'",
|
||||
"style-src 'unsafe-inline' 'self'",
|
||||
// Unsafe inline, unsafe-eval are needed for ckeditor :(
|
||||
"script-src 'self' 'unsafe-eval' 'unsafe-inline'",
|
||||
"child-src 'self' cryptpad.fr *.cryptpad.fr",
|
||||
"font-src 'self'",
|
||||
"connect-src 'self' wss://cryptpad.fr",
|
||||
// (insecure remote) images are included by users of the wysiwyg who embed photos in their pads
|
||||
"img-src *",
|
||||
].join('; '),
|
||||
|
||||
httpPort: 3000,
|
||||
|
||||
|
|
@ -51,7 +62,7 @@ module.exports = {
|
|||
//websocketPort: 3000,
|
||||
|
||||
/* if you want to run a different version of cryptpad but using the same websocket
|
||||
* server, you should use the other server port as websocketPort and disable
|
||||
* server, you should use the other server port as websocketPort and disable
|
||||
* the websockets on that server
|
||||
*/
|
||||
//useExternalWebsocket: false,
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
<!DOCTYPE html>
|
||||
<html class="cp">
|
||||
<!-- If this file is not called customize.dist/src/template.html, it is generated -->
|
||||
<head>
|
||||
<title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
|
||||
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
|
||||
|
|
@ -9,16 +10,8 @@
|
|||
<link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
|
||||
<script src="/bower_components/jquery/dist/jquery.min.js"></script>
|
||||
<link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
|
||||
<script data-main="/customize/main" src="/bower_components/requirejs/require.js"></script>
|
||||
<script data-bootload="/customize/main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
|
||||
|
||||
|
||||
<script src="/bower_components/requirejs/require.js"></script>
|
||||
<script>
|
||||
require.config({
|
||||
waitSeconds: 60,
|
||||
urlArgs: "bust=1.1.0",
|
||||
});
|
||||
</script>
|
||||
</head>
|
||||
<body class="html">
|
||||
<div id="cryptpadTopBar">
|
||||
|
|
@ -126,4 +119,3 @@
|
|||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
<!DOCTYPE html>
|
||||
<html class="cp">
|
||||
<!-- If this file is not called customize.dist/src/template.html, it is generated -->
|
||||
<head>
|
||||
<title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
|
||||
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
|
||||
|
|
@ -9,16 +10,8 @@
|
|||
<link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
|
||||
<script src="/bower_components/jquery/dist/jquery.min.js"></script>
|
||||
<link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
|
||||
<script data-main="/customize/main" src="/bower_components/requirejs/require.js"></script>
|
||||
<script data-bootload="/customize/main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
|
||||
|
||||
|
||||
<script src="/bower_components/requirejs/require.js"></script>
|
||||
<script>
|
||||
require.config({
|
||||
waitSeconds: 60,
|
||||
urlArgs: "bust=1.1.0",
|
||||
});
|
||||
</script>
|
||||
</head>
|
||||
<body class="html">
|
||||
<div id="cryptpadTopBar">
|
||||
|
|
@ -123,4 +116,3 @@
|
|||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
<!DOCTYPE html>
|
||||
<html class="cp">
|
||||
<!-- If this file is not called customize.dist/src/template.html, it is generated -->
|
||||
<head>
|
||||
<title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
|
||||
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
|
||||
|
|
@ -9,16 +10,8 @@
|
|||
<link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
|
||||
<script src="/bower_components/jquery/dist/jquery.min.js"></script>
|
||||
<link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
|
||||
<script data-main="/customize/main" src="/bower_components/requirejs/require.js"></script>
|
||||
<script data-bootload="/customize/main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
|
||||
|
||||
|
||||
<script src="/bower_components/requirejs/require.js"></script>
|
||||
<script>
|
||||
require.config({
|
||||
waitSeconds: 60,
|
||||
urlArgs: "bust=1.1.0",
|
||||
});
|
||||
</script>
|
||||
</head>
|
||||
<body class="html">
|
||||
<div id="cryptpadTopBar">
|
||||
|
|
@ -245,4 +238,3 @@
|
|||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
<!DOCTYPE html>
|
||||
<html class="cp">
|
||||
<!-- If this file is not called customize.dist/src/template.html, it is generated -->
|
||||
<head>
|
||||
<title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
|
||||
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
|
||||
|
|
@ -9,16 +10,8 @@
|
|||
<link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
|
||||
<script src="/bower_components/jquery/dist/jquery.min.js"></script>
|
||||
<link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
|
||||
<script data-main="/customize/main" src="/bower_components/requirejs/require.js"></script>
|
||||
<script data-bootload="/customize/main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
|
||||
|
||||
|
||||
<script src="/bower_components/requirejs/require.js"></script>
|
||||
<script>
|
||||
require.config({
|
||||
waitSeconds: 60,
|
||||
urlArgs: "bust=1.1.0",
|
||||
});
|
||||
</script>
|
||||
</head>
|
||||
<body class="html">
|
||||
<div id="cryptpadTopBar">
|
||||
|
|
@ -144,4 +137,3 @@
|
|||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,2 @@
|
|||
<link rel="stylesheet" type="text/css" href="main.css" />
|
||||
<script data-main="main" src="/bower_components/requirejs/require.js"></script>
|
||||
|
||||
<script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
|
||||
|
|
|
|||
|
|
@ -1,2 +1 @@
|
|||
<script data-main="main" src="/bower_components/requirejs/require.js"></script>
|
||||
<div id="container"></div>
|
||||
|
|
|
|||
|
|
@ -1,2 +1 @@
|
|||
<script data-main="/customize/main" src="/bower_components/requirejs/require.js"></script>
|
||||
|
||||
<script data-bootload="/customize/main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
<!DOCTYPE html>
|
||||
<html class="cp">
|
||||
<!-- If this file is not called customize.dist/src/template.html, it is generated -->
|
||||
<head>
|
||||
<title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
|
||||
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
|
||||
|
|
@ -10,13 +11,6 @@
|
|||
<script src="/bower_components/jquery/dist/jquery.min.js"></script>
|
||||
<link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
|
||||
{{script}}
|
||||
<script src="/bower_components/requirejs/require.js"></script>
|
||||
<script>
|
||||
require.config({
|
||||
waitSeconds: 60,
|
||||
urlArgs: "bust=1.1.0",
|
||||
});
|
||||
</script>
|
||||
</head>
|
||||
<body class="html">
|
||||
{{topbar}}
|
||||
|
|
@ -30,4 +24,3 @@
|
|||
{{footer}}
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
<!DOCTYPE html>
|
||||
<html class="cp">
|
||||
<!-- If this file is not called customize.dist/src/template.html, it is generated -->
|
||||
<head>
|
||||
<title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
|
||||
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
|
||||
|
|
@ -9,16 +10,8 @@
|
|||
<link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
|
||||
<script src="/bower_components/jquery/dist/jquery.min.js"></script>
|
||||
<link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
|
||||
<script data-main="/customize/main" src="/bower_components/requirejs/require.js"></script>
|
||||
<script data-bootload="/customize/main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
|
||||
|
||||
|
||||
<script src="/bower_components/requirejs/require.js"></script>
|
||||
<script>
|
||||
require.config({
|
||||
waitSeconds: 60,
|
||||
urlArgs: "bust=1.1.0",
|
||||
});
|
||||
</script>
|
||||
</head>
|
||||
<body class="html">
|
||||
<div id="cryptpadTopBar">
|
||||
|
|
@ -127,4 +120,3 @@
|
|||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
|
|
|||
|
|
@ -221,7 +221,7 @@ define(function () {
|
|||
out.login_noSuchUser = 'Invalid username or password. Try again, or sign up';
|
||||
out.login_invalUser = 'Username required';
|
||||
out.login_invalPass = 'Password required';
|
||||
out.login_unhandledError = 'An unexpected error occured :(';
|
||||
out.login_unhandledError = 'An unexpected error occurred :(';
|
||||
|
||||
out.register_importRecent = "Import pad history (Recommended)";
|
||||
out.register_acceptTerms = "I accept <a href='/terms.html'>the terms of service</a>";
|
||||
|
|
|
|||
24
server.js
24
server.js
|
|
@ -7,6 +7,7 @@ var Https = require('https');
|
|||
var Fs = require('fs');
|
||||
var WebSocketServer = require('ws').Server;
|
||||
var NetfluxSrv = require('./NetfluxWebsocketSrv');
|
||||
var Package = require('./package.json');
|
||||
|
||||
var config = require('./config');
|
||||
var websocketPort = config.websocketPort || config.httpPort;
|
||||
|
|
@ -19,20 +20,31 @@ var app = Express();
|
|||
|
||||
var httpsOpts;
|
||||
|
||||
const clone = (x) => (JSON.parse(JSON.stringify(x)));
|
||||
|
||||
var setHeaders = (function () {
|
||||
if (typeof(config.httpHeaders) !== 'object') { return function () {}; }
|
||||
|
||||
var headers = JSON.parse(JSON.stringify(config.httpHeaders));
|
||||
const headers = clone(config.httpHeaders);
|
||||
if (config.contentSecurity) {
|
||||
headers['Content-Security-Policy'] = clone(config.contentSecurity);
|
||||
}
|
||||
const padHeaders = clone(headers);
|
||||
if (config.padContentSecurity) {
|
||||
padHeaders['Content-Security-Policy'] = clone(config.padContentSecurity);
|
||||
}
|
||||
if (Object.keys(headers).length) {
|
||||
return function (res) {
|
||||
for (var header in headers) { res.setHeader(header, headers[header]); }
|
||||
return function (req, res) {
|
||||
const h = /^\/pad\/inner\.html.*/.test(req.url) ? padHeaders : headers;
|
||||
for (let header in h) { res.setHeader(header, h[header]); }
|
||||
};
|
||||
}
|
||||
return function () {};
|
||||
}());
|
||||
|
||||
app.use(function (req, res, next) {
|
||||
setHeaders(res);
|
||||
setHeaders(req, res);
|
||||
if (/[\?\&]ver=[^\/]+$/.test(req.url)) { res.setHeader("Cache-Control", "max-age=31536000"); }
|
||||
next();
|
||||
});
|
||||
|
||||
|
|
@ -82,6 +94,10 @@ app.get('/api/config', function(req, res){
|
|||
var host = req.headers.host.replace(/\:[0-9]+/, '');
|
||||
res.setHeader('Content-Type', 'text/javascript');
|
||||
res.send('define(' + JSON.stringify({
|
||||
requireConf: {
|
||||
waitSeconds: 60,
|
||||
urlArgs: 'ver=' + Package.version
|
||||
},
|
||||
websocketPath: config.useExternalWebsocket ? undefined : config.websocketPath,
|
||||
websocketURL:'ws' + ((useSecureWebsockets) ? 's' : '') + '://' + host + ':' +
|
||||
websocketPort + '/cryptpad_websocket',
|
||||
|
|
|
|||
|
|
@ -4,13 +4,7 @@
|
|||
<title>CryptPad</title>
|
||||
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<script data-main="main" src="/bower_components/requirejs/require.js"></script>
|
||||
<script>
|
||||
require.config({
|
||||
waitSeconds: 60,
|
||||
urlArgs: "bust=1.1.0",
|
||||
});
|
||||
</script>
|
||||
<script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
|
||||
<link rel="icon" type="image/png"
|
||||
href="/customize/main-favicon.png"
|
||||
|
||||
|
|
@ -49,11 +43,7 @@
|
|||
</head>
|
||||
<body>
|
||||
<div id="iframe-container">
|
||||
<iframe id="pad-iframe"></iframe>
|
||||
<script>
|
||||
document.getElementById('pad-iframe').setAttribute('src', 'inner.html?' + new Date().getTime());
|
||||
</script>
|
||||
<iframe id="pad-iframe"></iframe><script src="/common/noscriptfix.js"></script>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
|
|
|||
|
|
@ -689,7 +689,7 @@ define([
|
|||
// inform of network disconnect
|
||||
setEditable(false);
|
||||
toolbar.failed();
|
||||
Cryptpad.alert(Messages.common_connectionLost);
|
||||
Cryptpad.alert(Messages.common_connectionLost, undefined, force);
|
||||
};
|
||||
|
||||
var onConnectionChange = config.onConnectionChange = function (info) {
|
||||
|
|
@ -700,7 +700,7 @@ define([
|
|||
toolbar.reconnecting(info.myId);
|
||||
Cryptpad.findOKButton().click();
|
||||
} else {
|
||||
Cryptpad.alert(Messages.common_connectionLost);
|
||||
Cryptpad.alert(Messages.common_connectionLost, undefined, force);
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
// Stage 0, this gets cached which means we can't change it. boot2.js is changable.
|
||||
define(['/api/config?cb=' + (+new Date()).toString(16)], function (Config) {
|
||||
if (Config.requireConf) { require.config(Config.requireConf); }
|
||||
require(['/common/boot2.js']);
|
||||
});
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
// This is stage 1, it can be changed but you must bump the version of the project.
|
||||
define([], function () {
|
||||
// fix up locations so that relative urls work.
|
||||
require.config({ baseUrl: window.location.pathname });
|
||||
require([document.querySelector('script[data-bootload]').getAttribute('data-bootload')]);
|
||||
});
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
define([
|
||||
'/api/config?cb=' + Math.random().toString(16).slice(2),
|
||||
'/api/config',
|
||||
'/customize/messages.js?app=' + window.location.pathname.split('/').filter(function (x) { return x; }).join('.'),
|
||||
'/customize/fsStore.js',
|
||||
'/bower_components/chainpad-crypto/crypto.js?v=0.1.5',
|
||||
|
|
@ -838,7 +838,7 @@ define([
|
|||
if (!$('#' + LOADING).is(':visible')) { common.addLoadingScreen(); }
|
||||
$('.spinnerContainer').hide();
|
||||
if (transparent) { $('#' + LOADING).css('opacity', 0.8); }
|
||||
$('#' + LOADING).find('p').html(error || Messages.error);
|
||||
$('#' + LOADING).find('p').text(error || Messages.error);
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
@ -961,7 +961,7 @@ define([
|
|||
} else {
|
||||
callback();
|
||||
}
|
||||
common.alert(Messages.movedToTrash);
|
||||
common.alert(Messages.movedToTrash, undefined, true);
|
||||
return;
|
||||
});
|
||||
});
|
||||
|
|
@ -1292,8 +1292,9 @@ define([
|
|||
$(window).off('keyup', handler);
|
||||
};
|
||||
|
||||
common.alert = function (msg, cb) {
|
||||
common.alert = function (msg, cb, force) {
|
||||
cb = cb || function () {};
|
||||
if (force !== true) { msg = fixHTML(msg); }
|
||||
var keyHandler = listenForKeys(function (e) { // yes
|
||||
findOKButton().click();
|
||||
});
|
||||
|
|
@ -1306,9 +1307,10 @@ define([
|
|||
});
|
||||
};
|
||||
|
||||
common.prompt = function (msg, def, cb, opt) {
|
||||
common.prompt = function (msg, def, cb, opt, force) {
|
||||
opt = opt || {};
|
||||
cb = cb || function () {};
|
||||
if (force !== true) { msg = fixHTML(msg); }
|
||||
|
||||
var keyHandler = listenForKeys(function (e) { // yes
|
||||
findOKButton().click();
|
||||
|
|
@ -1329,9 +1331,11 @@ define([
|
|||
});
|
||||
};
|
||||
|
||||
common.confirm = function (msg, cb, opt) {
|
||||
common.confirm = function (msg, cb, opt, force) {
|
||||
opt = opt || {};
|
||||
cb = cb || function () {};
|
||||
if (force !== true) { msg = fixHTML(msg); }
|
||||
|
||||
var keyHandler = listenForKeys(function (e) {
|
||||
findOKButton().click();
|
||||
}, function (e) {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
// Fix for noscript bugs when caching iframe content.
|
||||
// Caution, this file will get cached, you must change the name if you change it.
|
||||
document.getElementById('pad-iframe').setAttribute('src', 'inner.html?cb=' + (+new Date()));
|
||||
|
|
@ -10,13 +10,7 @@
|
|||
data-alt-favicon="/customize/alt-favicon.png"
|
||||
id="favicon" />
|
||||
<link rel="stylesheet" href="/customize/main.css" />
|
||||
<script data-main="main" src="/bower_components/requirejs/require.js"></script>
|
||||
<script>
|
||||
require.config({
|
||||
waitSeconds: 60,
|
||||
urlArgs: "bust=1.1.0",
|
||||
});
|
||||
</script>
|
||||
<script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
|
||||
<style>
|
||||
html, body {
|
||||
margin: 0px;
|
||||
|
|
@ -38,10 +32,6 @@
|
|||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<iframe id="pad-iframe"></iframe>
|
||||
<script>
|
||||
document.getElementById('pad-iframe').setAttribute('src', 'inner.html?' + new Date().getTime());
|
||||
</script>
|
||||
<iframe id="pad-iframe"></iframe><script src="/common/noscriptfix.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ define([
|
|||
|
||||
// Use `$(function () {});` to make sure the html is loaded before doing anything else
|
||||
$(function () {
|
||||
|
||||
var $iframe = $('#pad-iframe').contents();
|
||||
var ifrw = $('#pad-iframe')[0].contentWindow;
|
||||
|
||||
|
|
@ -1796,7 +1795,7 @@ define([
|
|||
if (path.length !== 4) { return; }
|
||||
var element = filesOp.getTrashElementData(path);
|
||||
var sPath = stringifyPath(element.path);
|
||||
Cryptpad.alert('<strong>' + Messages.fm_originalPath + "</strong>:<br>" + sPath);
|
||||
Cryptpad.alert('<strong>' + Messages.fm_originalPath + "</strong>:<br>" + sPath, undefined, true);
|
||||
}
|
||||
module.hideMenu();
|
||||
});
|
||||
|
|
@ -2058,7 +2057,7 @@ define([
|
|||
$backupButton.attr('title', Messages.fm_backup_title);
|
||||
$backupButton.on('click', function() {
|
||||
var url = window.location.origin + window.location.pathname + '#' + editHash;
|
||||
Cryptpad.alert(Messages._getKey('fm_alert_backupUrl', [url]));
|
||||
Cryptpad.alert(Messages._getKey('fm_alert_backupUrl', [url]), undefined, true);
|
||||
$('#fm_backupUrl').val(url);
|
||||
$('#fm_backupUrl').click(function () {
|
||||
$(this).select();
|
||||
|
|
@ -2083,7 +2082,7 @@ define([
|
|||
setEditable(false);
|
||||
if (APP.refresh) { APP.refresh(); }
|
||||
APP.toolbar.failed();
|
||||
Cryptpad.alert(Messages.common_connectionLost);
|
||||
Cryptpad.alert(Messages.common_connectionLost, undefined, true);
|
||||
};
|
||||
var onReconnect = function (info) {
|
||||
setEditable(true);
|
||||
|
|
@ -2116,6 +2115,5 @@ define([
|
|||
onConnectError();
|
||||
}
|
||||
});
|
||||
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -10,12 +10,7 @@
|
|||
data-alt-favicon="/customize/alt-favicon.png"
|
||||
id="favicon" />
|
||||
<link rel="stylesheet" href="/customize/main.css" />
|
||||
<script data-main="main" src="/bower_components/requirejs/require.js"></script>
|
||||
<script>
|
||||
require.config({
|
||||
waitSeconds: 60,
|
||||
});
|
||||
</script>
|
||||
<script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
|
||||
<style>
|
||||
html, body {
|
||||
width: 100;
|
||||
|
|
@ -100,4 +95,3 @@
|
|||
<div id="lists"></div>
|
||||
<span id="create-list">Add List</span>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<head>
|
||||
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
|
||||
<script data-main="main" src="/bower_components/requirejs/require.js"></script>
|
||||
<script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
|
||||
<style>
|
||||
html, body{
|
||||
padding: 0px;
|
||||
|
|
@ -59,7 +59,7 @@
|
|||
</head>
|
||||
<body>
|
||||
|
||||
<canvas id="canvas" width="600" height="600" ></canvas>
|
||||
<canvas id="canvas" width="600" height="600" ></canvas>
|
||||
|
||||
<div id="copy">
|
||||
<h2>Welcome to CryptCanvas!</h2>
|
||||
|
|
@ -76,4 +76,3 @@
|
|||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<head>
|
||||
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
|
||||
<script data-main="main" src="/bower_components/requirejs/require.js"></script>
|
||||
<script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
|
||||
<style>
|
||||
html, body{
|
||||
padding: 0px;
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
<body>
|
||||
|
||||
<form>
|
||||
<input type="radio" name="radio" value="one" checked>One
|
||||
<input type="radio" name="radio" value="one" checked>One
|
||||
<input type="radio" name="radio" value="two">Two
|
||||
<input type="radio" name="radio" value="three">Three<br>
|
||||
|
||||
|
|
@ -76,4 +76,3 @@
|
|||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<head>
|
||||
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
|
||||
<script data-main="main" src="/bower_components/requirejs/require.js"></script>
|
||||
<script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
|
||||
<style>
|
||||
html, body{
|
||||
padding: 0px;
|
||||
|
|
@ -75,4 +75,3 @@
|
|||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<head>
|
||||
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
|
||||
<script data-main="main" src="/bower_components/requirejs/require.js"></script>
|
||||
<script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
|
||||
<style>
|
||||
html, body{
|
||||
padding: 0px;
|
||||
|
|
@ -48,4 +48,3 @@
|
|||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
|
|
|||
|
|
@ -2,12 +2,7 @@
|
|||
<html>
|
||||
<head>
|
||||
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
|
||||
<script data-main="main" src="/bower_components/requirejs/require.js"></script>
|
||||
<script>
|
||||
require.config({
|
||||
waitSeconds: 60,
|
||||
});
|
||||
</script>
|
||||
<script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
|
||||
<link rel="icon" type="image/png"
|
||||
href="/customize/main-favicon.png"
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
|
||||
<link rel="stylesheet" href="/common/render-sd.css" />
|
||||
<script data-main="main" src="/bower_components/requirejs/require.js"></script>
|
||||
<script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
|
||||
<style>
|
||||
html, body {
|
||||
padding: 0;
|
||||
|
|
@ -38,5 +38,5 @@
|
|||
</head>
|
||||
<body>
|
||||
<div id="target">
|
||||
<div id="inner"></div>
|
||||
<div id="inner"></div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -3,18 +3,18 @@
|
|||
<head>
|
||||
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
|
||||
<script data-main="main" src="/bower_components/requirejs/require.js"></script>
|
||||
<script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
|
||||
<style></style>
|
||||
</head>
|
||||
<body>
|
||||
<a id="edit" href="#" target="_blank">Edit this document's style</a>
|
||||
|
||||
<h1>HTML Ipsum Presents</h1>
|
||||
|
||||
|
||||
<p><strong>Pellentesque habitant morbi tristique</strong> senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. <em>Aenean ultricies mi vitae est.</em> Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, <code>commodo vitae</code>, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui. <a href="#">Donec non enim</a> in turpis pulvinar facilisis. Ut felis.</p>
|
||||
|
||||
<h2>Header Level 2</h2>
|
||||
|
||||
|
||||
<ol>
|
||||
<li>Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</li>
|
||||
<li>Aliquam tincidunt mauris eu risus.</li>
|
||||
|
|
@ -30,10 +30,10 @@
|
|||
</ul>
|
||||
|
||||
<pre><code>
|
||||
#header h1 a {
|
||||
display: block;
|
||||
width: 300px;
|
||||
height: 80px;
|
||||
#header h1 a {
|
||||
display: block;
|
||||
width: 300px;
|
||||
height: 80px;
|
||||
}
|
||||
</code></pre>
|
||||
|
||||
|
|
@ -58,4 +58,3 @@
|
|||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<head>
|
||||
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
|
||||
<script data-main="main" src="/bower_components/requirejs/require.js"></script>
|
||||
<script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
|
||||
<style>
|
||||
html, body{
|
||||
padding: 0px;
|
||||
|
|
@ -36,4 +36,3 @@
|
|||
<textarea></textarea>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
|
|
|||
|
|
@ -2,12 +2,7 @@
|
|||
<html>
|
||||
<head>
|
||||
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
|
||||
<script data-main="main" src="/bower_components/requirejs/require.js"></script>
|
||||
<script>
|
||||
require.config({
|
||||
waitSeconds: 60,
|
||||
});
|
||||
</script>
|
||||
<script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
|
||||
<link rel="icon" type="image/png"
|
||||
href="/customize/main-favicon.png"
|
||||
|
||||
|
|
@ -31,4 +26,3 @@ pre {
|
|||
<h1>Upload</h1>
|
||||
|
||||
<input type="file">
|
||||
|
||||
|
|
|
|||
|
|
@ -9,14 +9,7 @@
|
|||
<link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
|
||||
<script src="/bower_components/jquery/dist/jquery.min.js"></script>
|
||||
<link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
|
||||
<script data-main="main" src="/bower_components/requirejs/require.js"></script>
|
||||
<script src="/bower_components/requirejs/require.js"></script>
|
||||
<script>
|
||||
require.config({
|
||||
waitSeconds: 60,
|
||||
urlArgs: "bust=1.1.0",
|
||||
});
|
||||
</script>
|
||||
<script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
|
||||
</head>
|
||||
<body class="html">
|
||||
<div id="cryptpadTopBar">
|
||||
|
|
@ -77,4 +70,3 @@
|
|||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
|
|
|||
|
|
@ -10,13 +10,7 @@
|
|||
data-alt-favicon="/customize/alt-favicon.png"
|
||||
id="favicon" />
|
||||
<link rel="stylesheet" href="/customize/main.css" />
|
||||
<script data-main="main" src="/bower_components/requirejs/require.js"></script>
|
||||
<script>
|
||||
require.config({
|
||||
waitSeconds: 60,
|
||||
urlArgs: "bust=1.1.0",
|
||||
});
|
||||
</script>
|
||||
<script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
|
||||
<style>
|
||||
html, body {
|
||||
margin: 0px;
|
||||
|
|
@ -61,10 +55,6 @@
|
|||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<iframe id="pad-iframe"></iframe>
|
||||
<script>
|
||||
document.getElementById('pad-iframe').setAttribute('src', 'inner.html?' + new Date().getTime());
|
||||
</script>
|
||||
<iframe id="pad-iframe"></iframe><script src="/common/noscriptfix.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
|
|
|||
|
|
@ -726,7 +726,7 @@ define([
|
|||
setEditable(false);
|
||||
// TODO inform them that the session was torn down
|
||||
toolbar.failed();
|
||||
Cryptpad.alert(Messages.common_connectionLost);
|
||||
Cryptpad.alert(Messages.common_connectionLost, undefined, true);
|
||||
};
|
||||
|
||||
var onConnectionChange = realtimeOptions.onConnectionChange = function (info) {
|
||||
|
|
@ -737,7 +737,7 @@ define([
|
|||
toolbar.reconnecting(info.myId);
|
||||
Cryptpad.findOKButton().click();
|
||||
} else {
|
||||
Cryptpad.alert(Messages.common_connectionLost);
|
||||
Cryptpad.alert(Messages.common_connectionLost, undefined, true);
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -11,11 +11,7 @@
|
|||
id="favicon" />
|
||||
<link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
|
||||
<link rel="stylesheet" href="/customize/main.css" />
|
||||
<script data-main="main" src="/bower_components/requirejs/require.js"></script>
|
||||
<script> require.config({
|
||||
waitSeconds: 60,
|
||||
urlArgs: "bust=1.1.0",
|
||||
}); </script>
|
||||
<script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
|
||||
<style>
|
||||
html, body {
|
||||
width: 100%;
|
||||
|
|
|
|||
|
|
@ -662,7 +662,7 @@ define([
|
|||
|
||||
var disconnect = function (info) {
|
||||
//setEditable(false); // TODO
|
||||
Cryptpad.alert(Messages.common_connectionLost);
|
||||
Cryptpad.alert(Messages.common_connectionLost, undefined, true);
|
||||
};
|
||||
|
||||
var create = function (info) {
|
||||
|
|
|
|||
|
|
@ -5,15 +5,9 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
|
||||
<title>Cryptpad: login</title>
|
||||
<link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
|
||||
<script data-main="main" src="/bower_components/requirejs/require.js"></script>
|
||||
<script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
|
||||
<link rel="stylesheet" href="/customize/main.css" />
|
||||
<link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
|
||||
<script>
|
||||
require.config({
|
||||
waitSeconds: 60,
|
||||
urlArgs: "bust=1.1.0",
|
||||
});
|
||||
</script>
|
||||
</head>
|
||||
<body class="html">
|
||||
<div id="cryptpadTopBar">
|
||||
|
|
@ -89,4 +83,3 @@
|
|||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
<!DOCTYPE html>
|
||||
<html class="cp">
|
||||
<!-- If this file is not called customize.dist/src/template.html, it is generated -->
|
||||
<head>
|
||||
<title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
|
||||
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
|
||||
|
|
@ -10,16 +11,8 @@
|
|||
<script src="/bower_components/jquery/dist/jquery.min.js"></script>
|
||||
<link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
|
||||
<link rel="stylesheet" type="text/css" href="main.css" />
|
||||
<script data-main="main" src="/bower_components/requirejs/require.js"></script>
|
||||
<script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
|
||||
|
||||
|
||||
<script src="/bower_components/requirejs/require.js"></script>
|
||||
<script>
|
||||
require.config({
|
||||
waitSeconds: 60,
|
||||
urlArgs: "bust=1.1.0",
|
||||
});
|
||||
</script>
|
||||
</head>
|
||||
<body class="html">
|
||||
<div id="cryptpadTopBar">
|
||||
|
|
@ -68,8 +61,7 @@
|
|||
|
||||
|
||||
<div id="mainBlock" class="hidden">
|
||||
<script data-main="main" src="/bower_components/requirejs/require.js"></script>
|
||||
<div id="container"></div>
|
||||
<div id="container"></div>
|
||||
|
||||
</div>
|
||||
|
||||
|
|
@ -118,4 +110,3 @@
|
|||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
|
|
|||
|
|
@ -167,7 +167,7 @@ define([
|
|||
if (val !== "I love CryptPad") { return; }
|
||||
obj.proxy.drive = Cryptpad.getStore().getEmptyObject();
|
||||
Cryptpad.alert(Messages.settings_resetDone);
|
||||
});
|
||||
}, undefined, true);
|
||||
});
|
||||
|
||||
return $div;
|
||||
|
|
|
|||
|
|
@ -3,13 +3,7 @@
|
|||
<head>
|
||||
<title>CryptPad</title>
|
||||
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
|
||||
<script data-main="main" src="/bower_components/requirejs/require.js"></script>
|
||||
<script>
|
||||
require.config({
|
||||
waitSeconds: 60,
|
||||
urlArgs: "bust=1.1.0",
|
||||
});
|
||||
</script>
|
||||
<script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
|
||||
<link rel="icon" type="image/png"
|
||||
href="/customize/main-favicon.png"
|
||||
|
||||
|
|
@ -52,11 +46,7 @@
|
|||
</head>
|
||||
<body>
|
||||
<div id="iframe-container">
|
||||
<iframe id="pad-iframe"></iframe>
|
||||
<script>
|
||||
document.getElementById('pad-iframe').setAttribute('src', 'inner.html?' + new Date().getTime());
|
||||
</script>
|
||||
<iframe id="pad-iframe"></iframe><script src="/common/noscriptfix.js"></script>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
|
|
|||
|
|
@ -771,7 +771,7 @@ define([
|
|||
// inform of network disconnect
|
||||
setEditable(false);
|
||||
toolbar.failed();
|
||||
Cryptpad.alert(Messages.common_connectionLost);
|
||||
Cryptpad.alert(Messages.common_connectionLost, undefined, true);
|
||||
};
|
||||
|
||||
var onConnectionChange = config.onConnectionChange = function (info) {
|
||||
|
|
@ -782,7 +782,7 @@ define([
|
|||
toolbar.reconnecting(info.myId);
|
||||
Cryptpad.findOKButton().click();
|
||||
} else {
|
||||
Cryptpad.alert(Messages.common_connectionLost);
|
||||
Cryptpad.alert(Messages.common_connectionLost, undefined, true);
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue