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

customize.dist/pages.js

@@ -49,11 +49,6 @@ define([
                             h('p', Msg.main_footerText)
                         ])
                     ], ''),
-                   /* footerCol(null, [
-                        footLink('/about.html', 'about'),
-                        footLink('/terms.html', 'terms'),
-                        footLink('/privacy.html', 'privacy'),
-                    ], 'CryptPad'),*/
                     footerCol('footer_applications', [
                         footLink('/drive/', 'main_drive'),
                         footLink('/pad/', 'main_richText'),
@@ -76,7 +71,7 @@ define([
                     ])
                 ])
             ]),
-            h('div.cp-version-footer', "CryptPad v1.20.0 (Unicorn)")
+            h('div.cp-version-footer', "CryptPad v1.21.0 (Vampire)")
         ]);
     };
 
@@ -690,45 +685,5 @@ define([
         ];
     };
 
-    Pages['/drive/'] = Pages['/drive/index.html'] = function () {
-        return loadingScreen();
-    };
-
-    Pages['/file/'] = Pages['/file/index.html'] = function () {
-        return loadingScreen();
-    };
-
-    Pages['/contacts/'] = Pages['/contacts/index.html'] = function () {
-        return loadingScreen();
-    };
-
-    Pages['/pad/'] = Pages['/pad/index.html'] = function () {
-        return loadingScreen();
-    };
-
-    Pages['/code/'] = Pages['/code/index.html'] = function () {
-        return loadingScreen();
-    };
-
-    Pages['/slide/'] = Pages['/slide/index.html'] = function () {
-        return loadingScreen();
-    };
-
-    Pages['/invite/'] = Pages['/invite/index.html'] = function () {
-        return loadingScreen();
-    };
-
-    Pages['/settings/'] = Pages['/settings/index.html'] = function () {
-        return loadingScreen();
-    };
-
-    Pages['/profile/'] = Pages['/profile/index.html'] = function () {
-        return loadingScreen();
-    };
-
-    Pages['/todo/'] = Pages['/todo/index.html'] = function () {
-        return loadingScreen();
-    };
-
     return Pages;
 });

customize.dist/template.js

@@ -1,11 +1,10 @@
 define([
     'jquery',
     '/common/hyperscript.js',
-    '/common/cryptpad-common.js',
     '/customize/pages.js',
 
     'less!/bower_components/components-font-awesome/css/font-awesome.min.css',
-], function ($, h, Cryptpad, Pages) {
+], function ($, h, Pages) {
 $(function () {
     var $body = $('body');
     var isMainApp = function () {