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

CHANGELOG.md

@@ -10,6 +10,9 @@
 * support displaying a roadmap in static pages' footer
 * adjust threshold for whiteboard file size limit to better match user expectation (file size instead of base64 size)
 * FLOC OFF GOOGLE header
+* /report/ page
+* broadcast channel included in pin list
+* fix package-lock to use server update
 
 # 4.4.0
 

package-lock.json

@@ -403,9 +403,9 @@
       }
     },
     "chainpad-server": {
-      "version": "5.0.0",
+      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/chainpad-server/-/chainpad-server-5.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/chainpad-server/-/chainpad-server-5.1.0.tgz",
-      "integrity": "sha512-rfJxcWdF5InMPnNkhMWD+VRwzKUcUQktMG7DpEs90zuB7w6e8rs4MAOTEmc2rgK5EB0fYTlOMdSft58hKnbgHw==",
+      "integrity": "sha512-BdjgOOLTXXo1EjQ7lURDe7oqsqfQISNvwhILfp3K3diY2K1hxpPLbjYzOSgxNOTADeOAff0xnInR5eUCESVWaQ==",
       "requires": {
         "nthen": "0.1.8",
         "pull-stream": "^3.6.9",

package.json

@@ -14,7 +14,7 @@
   "dependencies": {
     "@mcrowe/minibloom": "^0.2.0",
     "chainpad-crypto": "^0.2.5",
-    "chainpad-server": "^5.0.0",
+    "chainpad-server": "^5.1.0",
     "express": "~4.16.0",
     "fs-extra": "^7.0.0",
     "get-folder-size": "^2.0.1",