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

config.js.dist

@@ -32,9 +32,14 @@ module.exports = {
          *  it is recommended that you configure these fields to match the
          *  domain which will serve your cryptpad instance.
          */
-        "connect-src 'self' ws://*",
         "child-src 'self' *",
 
+        /*  this allows connections over secure or insecure websockets
+            if you are deploying to production, you'll probably want to remove
+            the ws://* directive, and change '*' to your domain
+         */
+        "connect-src 'self' ws://* wss://*",
+
         // data: is used by codemirror
         "img-src 'self' data:",
     ].join('; '),
@@ -51,7 +56,9 @@ module.exports = {
          *  configured for best effect.
          */
          "child-src 'self' *",
-         "connect-src 'self' ws://*",
+
+        // see the comment above in the 'contentSecurity' section
+         "connect-src 'self' ws://* wss://*",
 
         // (insecure remote) images are included by users of the wysiwyg who embed photos in their pads
         "img-src *",

customize.dist/about.html

@@ -115,7 +115,7 @@
                     </div>
             </div>
         </div>
-            <div class="version-footer">CryptPad v1.3.0 (Dahu)</div>
+            <div class="version-footer">CryptPad v1.4.0 (Easter-Bunny)</div>
     </footer>
 
 </body>

customize.dist/contact.html

@@ -112,7 +112,7 @@
                     </div>
             </div>
         </div>
-            <div class="version-footer">CryptPad v1.3.0 (Dahu)</div>
+            <div class="version-footer">CryptPad v1.4.0 (Easter-Bunny)</div>
     </footer>
 
 </body>

customize.dist/index.html

@@ -234,7 +234,7 @@
                     </div>
             </div>
         </div>
-            <div class="version-footer">CryptPad v1.3.0 (Dahu)</div>
+            <div class="version-footer">CryptPad v1.4.0 (Easter-Bunny)</div>
     </footer>
 
 </body>

customize.dist/privacy.html

@@ -133,7 +133,7 @@
                     </div>
             </div>
         </div>
-            <div class="version-footer">CryptPad v1.3.0 (Dahu)</div>
+            <div class="version-footer">CryptPad v1.4.0 (Easter-Bunny)</div>
     </footer>
 
 </body>

customize.dist/src/fragments/footer.html

@@ -39,5 +39,5 @@
                     </div>
             </div>
         </div>
-            <div class="version-footer">CryptPad v1.3.0 (Dahu)</div>
+            <div class="version-footer">CryptPad v1.4.0 (Easter-Bunny)</div>
     </footer>

customize.dist/terms.html

@@ -116,7 +116,7 @@
                     </div>
             </div>
         </div>
-            <div class="version-footer">CryptPad v1.3.0 (Dahu)</div>
+            <div class="version-footer">CryptPad v1.4.0 (Easter-Bunny)</div>
     </footer>
 
 </body>

readme.md

@@ -73,8 +73,6 @@ npm update;
 
 To reset your instance of Cryptpad and remove all the data that is being stored:
 
-
-
 ```
 # change into your cryptpad directory
 cd /your/cryptpad/instance/location;
@@ -104,10 +102,6 @@ You can do so by launching your server in _dev mode_, like so:
 
 `DEV=1 node server.js`
 
-# Setup using Docker
-
-See [Cryptpad-Docker](cryptpad-docker.md)
-
 ## Security
 
 CryptPad is *private*, not *anonymous*. Privacy protects your data, anonymity protects you.
@@ -127,6 +121,10 @@ the battery out of your computer before it spawns Agent Smith.
 
 Still there are other low-lives in the world so using CryptPad over HTTPS is probably a good idea.
 
+## Setup using Docker
+
+See [Cryptpad-Docker](cryptpad-docker.md)
+
 ## Translations
 
 We'd like to make it easy for more people to use encryption in their routine activities.

www/settings/index.html

@@ -106,7 +106,7 @@
                     </div>
             </div>
         </div>
-            <div class="version-footer">CryptPad v1.3.0 (Dahu)</div>
+            <div class="version-footer">CryptPad v1.4.0 (Easter-Bunny)</div>
     </footer>
 
 </body>