From 9309c3df8fffe5f307e48a35484d752440cf852d Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 23 Apr 2018 15:44:00 +0200
Subject: Update changelog

---
 CHANGELOG.md                | 43 +++++++++++++++++++++++++++++++++++++++++++
 README.md                   |  2 +-
 server/controllers/feeds.ts |  3 ++-
 3 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 149c82e9f..c82abafe0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,48 @@
 # Changelog
 
+## v1.0.0-beta.4
+
+### BREAKING CHANGES
+
+ * Hide by default NSFW videos. Update the `instance.default_nsfw_policy` configuration to `blur` to keep the old behaviour
+ * Use ISO 639 for language (*en*, *es*, *fr*...)
+  * Tools (`import-videos`...) need the language ISO639 code instead of a number
+  * API (`upload`, `update`, `list`...) need/return the language ISO639 code instead of a number
+
+### Features
+
+ * Add `publishedAt` attribute to videos
+ * Improve player:
+  * Smooth progress bar
+  * Settings menu
+  * Automatic resolution (depending on the user bandwidth)
+  * Some animations/effects
+  * More reactive when clicking on play
+  * Handle autoplay blocking by some web browsers
+  * Better responsive
+  * Add ability to link a specific timestamp. Example: https://peertube2.cpy.re/videos/watch/f78a97f8-a142-4ce1-a5bd-154bf9386504?start=58
+ * Add an id to the body to override current CSS (for custom CSS)
+ * Add privacy argument to `upload.ts` script
+ * RSS/Atom/JSON-feed for videos recently-added/trending/account
+ * Support hostname binding in the configuration
+ * Add ability to click on an account in the video watch page (link to a search)
+ * Better responsive on many comment replies
+ * Move follows in the job queue
+ * Add ability to choose the NSFW videos policy: hide, blur or display. Could be overrode by the user
+ * Add video privacy information in *my videos page*
+ * Use the video name for the torrent file name instead of the UUID
+ * Handle errors in embed (video not found, server error...)
+
+### Bug fixes
+
+ * Fix "show more" description on video change
+ * Accept unlisted comments
+ * Don't start application until all components were initialized
+ * Fix word-break in video description and video comments
+ * Don't add a `.` after the URL in the "forgot password" email
+
+
+
 ## v1.0.0-beta.3
 
 ### Features
diff --git a/README.md b/README.md
index 566b8f1a9..8abdaf67d 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Federated (ActivityPub) video streaming platform using P2P (BitTorrent)
 directly in the web browser with <a href="https://github.com/feross/webtorrent">WebTorrent</a>.
 </h4>
 
-**PeerTube is developed by [Framasoft](https://framatube.org/#en), a non-profit
+**PeerTube is developed by [Framasoft](https://framasoft.org/?l=en), a non-profit
 that promotes and spreads free culture in general, and free-libre software in
 particular. If you want to support this project, please [consider
 donating to them](https://soutenir.framasoft.org/en/).**
diff --git a/server/controllers/feeds.ts b/server/controllers/feeds.ts
index 27ebecc40..4a4dc3820 100644
--- a/server/controllers/feeds.ts
+++ b/server/controllers/feeds.ts
@@ -40,7 +40,8 @@ async function generateFeed (req: express.Request, res: express.Response, next:
       start,
       FEEDS.COUNT,
       req.query.sort as VideoSortField,
-      hideNSFW
+      hideNSFW,
+      true
     )
   } else {
     resultList = await VideoModel.listForApi(
-- 
cgit v1.2.3