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

config.example.js

@@ -82,23 +82,6 @@ module.exports = {
      */
     websocketPath: '/cryptpad_websocket',
 
-    /*  it is assumed that your websocket will bind to the same port as http
-     *  you can override this behaviour by supplying a number via websocketPort
-     */
-    //websocketPort: 3000,
-
-    /*  if you want to run a different version of CryptPad but using the same websocket
-     *  server, you should use the other server port as websocketPort and disable
-     *  the websockets on that server
-     */
-    //useExternalWebsocket: false,
-
-    /*  If CryptPad is proxied without using https, the server needs to know.
-     *  Specify 'useSecureWebsockets: true' so that it can send
-     *  Content Security Policy Headers that prevent http and https from mixing
-     */
-     useSecureWebsockets: false,
-
     /*  CryptPad can log activity to stdout
      *  This may be useful for debugging
      */
@@ -238,14 +221,6 @@ module.exports = {
      */
     suppressRPCErrors: false,
 
-
-    /* WARNING: EXPERIMENTAL
-     *
-     *  CryptPad features experimental support for encrypted file upload.
-     *  Our encryption format is still liable to change. As such, we do not
-     *  guarantee that files uploaded now will be supported in the future
-     */
-
     /*  Setting this value to anything other than true will cause file upload
      *  attempts to be rejected outright.
      */

customize.dist/pages.js

@@ -46,7 +46,9 @@ define([
             h('div.container', [
                 h('div.row', [
                     footerCol(null, [
-                        setHTML(h('div.cp-bio-foot'), '<p>With CryptPad, you can make quick collaborative documents for taking notes and writing down ideas together.</p>'),
+                        h('div.cp-bio-foot', [
+                            h('p', Msg.main_footerText)
+                        ])
                     ], ''),
                    /* footerCol(null, [
                         footLink('/about.html', 'about'),

customize.dist/translations/messages.js

@@ -545,6 +545,7 @@ define(function () {
     out.main_whiteboardPad = 'Whiteboard';
     out.main_localPads = 'Local Pads';
     out.main_yourCryptDrive = 'Your CryptDrive';
+    out.main_footerText = "With CryptPad, you can make quick collaborative documents for taking notes and writing down ideas together.";
 
     out.footer_applications = "Applications";
     out.footer_contact = "Contact";

package.json

@@ -1,7 +1,7 @@
 {
   "name": "cryptpad",
   "description": "realtime collaborative visual editor with zero knowlege server",
-  "version": "1.12.0",
+  "version": "1.13.0",
   "dependencies": {
     "chainpad-server": "^1.0.1",
     "express": "~4.10.1",