From 77a87fec6c244074b786f67e135a1fe35bd7009f Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 28 May 2018 17:28:53 +0200
Subject: [PATCH 1/1] Update changelog

---
 CHANGELOG.md                             | 27 ++++++++++++++++++++++++
 README.md                                |  4 +++-
 server/tests/api/videos/video-privacy.ts |  2 ++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5cf44eb3c..10a73d93e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,32 @@
 # Changelog
 
+## v1.0.0-beta.7
+
+### BREAKING CHANGES
+
+ * Account client URLs are now `/accounts/{username}/` (and not `/accounts/{id}/`)
+
+### Documentation
+
+ * Better documentation on how to deploy with Docker: https://github.com/Chocobozzz/PeerTube/blob/develop/support/doc/docker.md
+
+### Features
+
+ * Add short description in about page
+ * Add owner account name in video channel page
+ * Improve performance in ActivityPub controllers
+ * Video **support** field inherits video channel **support** field when uploading/updating a video
+ * Resume video when clicking on "PeerTube" link in embed
+
+### Bug fixes
+
+ * Fix player on Android
+ * Fix player when Firefox has cookies disabled
+ * Reload "my videos" after a delete
+ * Fix missing key configuration when upgrading with Docker
+ * Fix CC audience in Activity Pub objects/activities
+
+
 ## v1.0.0-beta.6
 
 ### Features
diff --git a/README.md b/README.md
index 985b25b68..9ba01d99e 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,9 @@ Federated (ActivityPub) video streaming platform using P2P (BitTorrent)
 directly in the web browser with <a href="https://github.com/feross/webtorrent">WebTorrent</a>.
 </p>
 
-**We are running [a crowdfunding campaign](https://www.kisskissbankbank.com/en/projects/peertube-a-free-and-federated-video-platform) to pave the road to version 1.0 of PeerTube!**
+<p align="center">
+<strong>We are running <a href="https://www.kisskissbankbank.com/en/projects/peertube-a-free-and-federated-video-platform">a crowdfunding campaign</a> to pave the road to version 1.0 of PeerTube!</strong>
+</p>
 
 <p align="center">
   <strong>Client</strong>
diff --git a/server/tests/api/videos/video-privacy.ts b/server/tests/api/videos/video-privacy.ts
index 8ab37189a..ea435d5af 100644
--- a/server/tests/api/videos/video-privacy.ts
+++ b/server/tests/api/videos/video-privacy.ts
@@ -73,6 +73,8 @@ describe('Test video privacy', function () {
   })
 
   it('Should not be able to watch this private video with another user', async function () {
+    this.timeout(10000)
+
     const user = {
       username: 'hello',
       password: 'super password'
-- 
2.41.0