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

customize.dist/about.html

@@ -15,6 +15,7 @@
     <script>
         require.config({
             waitSeconds: 60,
+            urlArgs: "bust=1.0.0",
         });
     </script>
 </head>

customize.dist/contact.html

@@ -15,6 +15,7 @@
     <script>
         require.config({
             waitSeconds: 60,
+            urlArgs: "bust=1.0.0",
         });
     </script>
 </head>

customize.dist/fsStore.js

@@ -2,7 +2,7 @@ define([
     '/api/config?cb=' + Math.random().toString().slice(2),
     '/customize/messages.js?app=fs',
     '/bower_components/chainpad-listmap/chainpad-listmap.js',
-    '/bower_components/chainpad-crypto/crypto.js',
+    '/bower_components/chainpad-crypto/crypto.js?v=0.1.5',
     '/bower_components/textpatcher/TextPatcher.amd.js',
     '/common/fileObject.js',
     '/bower_components/jquery/dist/jquery.min.js',

customize.dist/index.html

@@ -15,6 +15,7 @@
     <script>
         require.config({
             waitSeconds: 60,
+            urlArgs: "bust=1.0.0",
         });
     </script>
 </head>

customize.dist/privacy.html

@@ -15,6 +15,7 @@
     <script>
         require.config({
             waitSeconds: 60,
+            urlArgs: "bust=1.0.0",
         });
     </script>
 </head>

customize.dist/src/template.html

@@ -15,6 +15,7 @@
     <script>
         require.config({
             waitSeconds: 60,
+            urlArgs: "bust=1.0.0",
         });
     </script>
 </head>

customize.dist/terms.html

@@ -15,6 +15,7 @@
     <script>
         require.config({
             waitSeconds: 60,
+            urlArgs: "bust=1.0.0",
         });
     </script>
 </head>

www/code/index.html

@@ -8,6 +8,7 @@
     <script>
         require.config({
             waitSeconds: 60,
+            urlArgs: "bust=1.0.0",
         });
     </script>
     <link rel="icon" type="image/png"

www/common/cryptpad-common.js

@@ -2,7 +2,7 @@ define([
     '/api/config?cb=' + Math.random().toString(16).slice(2),
     '/customize/messages.js',
     '/customize/fsStore.js',
-    '/bower_components/chainpad-crypto/crypto.js',
+    '/bower_components/chainpad-crypto/crypto.js?v=0.1.5',
     '/bower_components/alertifyjs/dist/js/alertify.js',
     '/bower_components/spin.js/spin.min.js',
     '/common/clipboard.js',
@@ -357,7 +357,7 @@ define([
                     title: pad[2] || hash && hash.slice(0,8),
                     ctime: pad[1],
                 };
-            } else if (typeof(pad) === 'object') {
+            } else if (pad && typeof(pad) === 'object') {
                 if (!pad.ctime) { pad.ctime = pad.atime; }
                 if (!pad.title) {
                     pad.href.replace(/#(.*)$/, function (x, hash) {
@@ -373,7 +373,7 @@ define([
             } else {
                 console.error("[Cryptpad.migrateRecentPads] pad had unexpected value");
                 console.log(pad);
-                return {};
+                return;
             }
         }).filter(function (x) { return x; });
     };

www/drive/index.html

@@ -14,6 +14,7 @@
     <script>
         require.config({
             waitSeconds: 60,
+            urlArgs: "bust=1.0.0",
         });
     </script>
     <style>

www/login/index.html

@@ -15,6 +15,7 @@
     <script>
         require.config({
             waitSeconds: 60,
+            urlArgs: "bust=1.0.0",
         });
     </script>
 </head>

www/pad/index.html

@@ -14,6 +14,7 @@
     <script>
         require.config({
             waitSeconds: 60,
+            urlArgs: "bust=1.0.0",
         });
     </script>
     <style>

www/poll/index.html

@@ -12,7 +12,10 @@
     <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, }); </script>
+    <script> require.config({
+        waitSeconds: 60,
+        urlArgs: "bust=1.0.0",
+    }); </script>
     <style>
         html, body {
             width: 100%;

www/register/index.html

@@ -8,6 +8,12 @@
     <script data-main="main" 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.0.0",
+        });
+    </script>
 </head>
 <body class="html">
     <div id="cryptpadTopBar">

www/slide/index.html

@@ -7,6 +7,7 @@
     <script>
         require.config({
             waitSeconds: 60,
+            urlArgs: "bust=1.0.0",
         });
     </script>
     <link rel="icon" type="image/png"