From 34b6507fa38d84e115ab3a1e293b734d37c59b2f Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 17 Feb 2017 12:38:10 +0100
Subject: [PATCH 1/2] implement cache-busting everywhere

---
 customize.dist/about.html        | 1 +
 customize.dist/contact.html      | 1 +
 customize.dist/index.html        | 1 +
 customize.dist/privacy.html      | 1 +
 customize.dist/src/template.html | 1 +
 customize.dist/terms.html        | 1 +
 www/code/index.html              | 1 +
 www/drive/index.html             | 1 +
 www/login/index.html             | 1 +
 www/pad/index.html               | 1 +
 www/poll/index.html              | 5 ++++-
 www/register/index.html          | 6 ++++++
 www/slide/index.html             | 1 +
 13 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/customize.dist/about.html b/customize.dist/about.html
index 31d759829..59e40f41e 100644
--- a/customize.dist/about.html
+++ b/customize.dist/about.html
@@ -15,6 +15,7 @@
     <script>
         require.config({
             waitSeconds: 60,
+            urlArgs: "bust=1.0.0",
         });
     </script>
 </head>
diff --git a/customize.dist/contact.html b/customize.dist/contact.html
index fac5078a3..d6f13f1ce 100644
--- a/customize.dist/contact.html
+++ b/customize.dist/contact.html
@@ -15,6 +15,7 @@
     <script>
         require.config({
             waitSeconds: 60,
+            urlArgs: "bust=1.0.0",
         });
     </script>
 </head>
diff --git a/customize.dist/index.html b/customize.dist/index.html
index c594804fb..dee3837d3 100644
--- a/customize.dist/index.html
+++ b/customize.dist/index.html
@@ -15,6 +15,7 @@
     <script>
         require.config({
             waitSeconds: 60,
+            urlArgs: "bust=1.0.0",
         });
     </script>
 </head>
diff --git a/customize.dist/privacy.html b/customize.dist/privacy.html
index 246ca1807..46994e93a 100644
--- a/customize.dist/privacy.html
+++ b/customize.dist/privacy.html
@@ -15,6 +15,7 @@
     <script>
         require.config({
             waitSeconds: 60,
+            urlArgs: "bust=1.0.0",
         });
     </script>
 </head>
diff --git a/customize.dist/src/template.html b/customize.dist/src/template.html
index 5c2b539d5..fdaa7e155 100644
--- a/customize.dist/src/template.html
+++ b/customize.dist/src/template.html
@@ -15,6 +15,7 @@
     <script>
         require.config({
             waitSeconds: 60,
+            urlArgs: "bust=1.0.0",
         });
     </script>
 </head>
diff --git a/customize.dist/terms.html b/customize.dist/terms.html
index d31cc9168..170437136 100644
--- a/customize.dist/terms.html
+++ b/customize.dist/terms.html
@@ -15,6 +15,7 @@
     <script>
         require.config({
             waitSeconds: 60,
+            urlArgs: "bust=1.0.0",
         });
     </script>
 </head>
diff --git a/www/code/index.html b/www/code/index.html
index 5975e79d9..6cfc7fd7e 100644
--- a/www/code/index.html
+++ b/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"
diff --git a/www/drive/index.html b/www/drive/index.html
index 36502515b..d5398cd59 100644
--- a/www/drive/index.html
+++ b/www/drive/index.html
@@ -14,6 +14,7 @@
     <script>
         require.config({
             waitSeconds: 60,
+            urlArgs: "bust=1.0.0",
         });
     </script>
     <style>
diff --git a/www/login/index.html b/www/login/index.html
index 2a54f2a05..5b9ef90e1 100644
--- a/www/login/index.html
+++ b/www/login/index.html
@@ -15,6 +15,7 @@
     <script>
         require.config({
             waitSeconds: 60,
+            urlArgs: "bust=1.0.0",
         });
     </script>
 </head>
diff --git a/www/pad/index.html b/www/pad/index.html
index e3064d18b..96df0bc09 100644
--- a/www/pad/index.html
+++ b/www/pad/index.html
@@ -14,6 +14,7 @@
     <script>
         require.config({
             waitSeconds: 60,
+            urlArgs: "bust=1.0.0",
         });
     </script>
     <style>
diff --git a/www/poll/index.html b/www/poll/index.html
index 64d47c816..b7f331db9 100644
--- a/www/poll/index.html
+++ b/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%;
diff --git a/www/register/index.html b/www/register/index.html
index f99c69905..a1c83b97f 100644
--- a/www/register/index.html
+++ b/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">
diff --git a/www/slide/index.html b/www/slide/index.html
index c5f2f0fd6..2d8b4f349 100644
--- a/www/slide/index.html
+++ b/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"

From 239e2bcc1f499568d2e0a240e0f05e13931078f2 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 17 Feb 2017 15:16:30 +0100
Subject: [PATCH 2/2] Fix issue with null entries in Cryptpad_RECENTPADS

---
 www/common/cryptpad-common.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index f6dfb0ee7..f2a5bd131 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.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; });
     };