From bd45aeaa031e1c03d2faa9a6dbcb7ed4c7e49fcb Mon Sep 17 00:00:00 2001 From: ansuz Date: Wed, 16 Aug 2017 10:31:47 +0200 Subject: [PATCH 1/3] bump package.json version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a2b893d21..9821b6bdb 100644 --- a/package.json +++ b/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", From 7537caf8fea9ad7d455fc9e97c57ac83cb3b5e37 Mon Sep 17 00:00:00 2001 From: ansuz Date: Wed, 16 Aug 2017 10:51:08 +0200 Subject: [PATCH 2/3] make footer translateable --- customize.dist/pages.js | 4 +++- customize.dist/translations/messages.js | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/customize.dist/pages.js b/customize.dist/pages.js index 1ae3dbf0f..b6cf5df37 100644 --- a/customize.dist/pages.js +++ b/customize.dist/pages.js @@ -46,7 +46,9 @@ define([ h('div.container', [ h('div.row', [ footerCol(null, [ - setHTML(h('div.cp-bio-foot'), '

With CryptPad, you can make quick collaborative documents for taking notes and writing down ideas together.

'), + h('div.cp-bio-foot', [ + h('p', Msg.main_footerText) + ]) ], ''), /* footerCol(null, [ footLink('/about.html', 'about'), diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js index 34c1f2d5e..262f9890c 100644 --- a/customize.dist/translations/messages.js +++ b/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"; From 9213aa7ee43046f96fee3d3c18a2b740ce64f925 Mon Sep 17 00:00:00 2001 From: ansuz Date: Wed, 16 Aug 2017 11:02:03 +0200 Subject: [PATCH 3/3] simplify example config --- config.example.js | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/config.example.js b/config.example.js index 43438aea6..7af6cf8af 100644 --- a/config.example.js +++ b/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. */