From cc0574f61bc02b40d2a8de083869b4f1fdb8d198 Mon Sep 17 00:00:00 2001 From: zertrin Date: Sat, 31 Aug 2019 14:08:55 +0800 Subject: [PATCH 1/3] Fix link to Docker wiki page on readme.md --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index b6a3d9b17..2556a8223 100644 --- a/readme.md +++ b/readme.md @@ -22,7 +22,7 @@ The most recent version and all past release notes can be found [here](https://g ## Setup using Docker -See [Cryptpad-Docker](docs/cryptpad-docker.md) and the community wiki's [Docker](https://github.com/xwiki-labs/cryptpad/wiki/Docker-(with-Nginx-and-Traefik)) page for details on how to get up-and-running with Cryptpad in Docker. +See [Cryptpad-Docker](docs/cryptpad-docker.md) and the community wiki's [Docker](https://github.com/xwiki-labs/cryptpad/wiki/Docker) page for details on how to get up-and-running with Cryptpad in Docker. ## Setup using Ansible From 9e8c7170354c20cbab9df9a5c8cbf80d7968a42b Mon Sep 17 00:00:00 2001 From: yflory Date: Mon, 2 Sep 2019 11:30:48 +0200 Subject: [PATCH 2/3] Fix onlyoffice lastKnownHash bug --- www/common/outer/onlyoffice.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/common/outer/onlyoffice.js b/www/common/outer/onlyoffice.js index 37359d757..1dc010ba4 100644 --- a/www/common/outer/onlyoffice.js +++ b/www/common/outer/onlyoffice.js @@ -91,9 +91,9 @@ define([ var hk = network.historyKeeper; var cfg = { - validateKey: obj.validateKey, + lastKnownHash: chan.lastKnownHash || chan.lastCpHash, metadata: { - lastKnownHash: chan.lastKnownHash || chan.lastCpHash, + validateKey: obj.validateKey, owners: obj.owners, expire: obj.expire } From 4e5f6edac4f9a3a7a4756eb543d29dc9d1eef32a Mon Sep 17 00:00:00 2001 From: ansuz Date: Mon, 2 Sep 2019 11:58:43 +0200 Subject: [PATCH 3/3] update version to 3.0.1 for a minor release --- customize.dist/pages.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/customize.dist/pages.js b/customize.dist/pages.js index 4334541bb..9791e83f0 100644 --- a/customize.dist/pages.js +++ b/customize.dist/pages.js @@ -103,7 +103,7 @@ define([ ])*/ ]) ]), - h('div.cp-version-footer', "CryptPad v3.0.0 (Aurochs)") + h('div.cp-version-footer', "CryptPad v3.0.1 (Aurochs' revenge)") ]); }; diff --git a/package.json b/package.json index 8ed4b4e9d..c28797340 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cryptpad", "description": "realtime collaborative visual editor with zero knowlege server", - "version": "3.0.0", + "version": "3.0.1", "license": "AGPL-3.0+", "repository": { "type": "git",