Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

6 years ago · 24c4029922
parent 47cb776d6c 92d87787c9
commit 24c4029922
3 changed files with 46 additions and 1 deletions
--- a/config/config.example.js
+++ b/config/config.example.js
@ -132,7 +132,8 @@ module.exports = {
        'contact',
        'what-is-cryptpad',
        'features',
-        'faq'
+        'faq',
        'maintenance'
    ],
    /* =====================
--- a/customize.dist/maintenance.html
+++ b/customize.dist/maintenance.html
@ -0,0 +1,40 @@
 <!DOCTYPE html>
 <html>
 <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"/>
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
    <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
    <style>
        html {
            height: 100%;
        }
        body {
            transition: opacity 0.75s, visibility 0s 0.75s;
            visibility: visible;
            position: fixed;
            z-index: 10000000;
            top: 0px;
            bottom: 0px;
            left: 0px;
            right: 0px;
            background: linear-gradient(to right, #326599 0%, #326599 50%, #4591c4 50%, #4591c4 100%);
            color: #fafafa;
            font-size: 1.5em;
            opacity: 1;
            display: flex;
            flex-flow: column;
            justify-content: center;
            align-items: center;
            font-family: monospace;
        }
        #cp-logo {
            max-width: 300px;
        }
    </style>
 </head>
 <body class="html">
 <img id="cp-logo" src="/customize/loading-logo.png">
 <h1>Maintenance</h1>
 <h3>We are currently upgrading CryptPad. We will be back shortly!</h3>
--- a/www/common/outer/serviceworker.js
+++ b/www/common/outer/serviceworker.js
@ -18,6 +18,9 @@ var debug = function (msg) { console.log(msg); };
 var init = function (client, cb) {
    debug('SW INIT');
    require.config({
        waitSeconds: 600
    });
    require(['/api/config?cb=' + (+new Date()).toString(16)], function (ApiConfig) {
        if (ApiConfig.requireConf) { require.config(ApiConfig.requireConf); }
@ -105,6 +108,7 @@ var init = function (client, cb) {
                                Rpc._subscribeToMessenger(clientId);
                            }
                            if (data && data.state === "ALREADY_INIT") {
                                self.store = data.returned;
                                return void cb(data.returned);
                            }
                            self.store = data;