From f2c6d11bd8a70c58d5379ad7a2a8edae86c14a4f Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 21 May 2019 17:18:59 +0200
Subject: [PATCH 1/2] Update changelog

---
 CHANGELOG.md | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1feaab7c1..62b1b057a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,26 +1,44 @@
 # Changelog
 
+## v1.3.0-rc.2
+
+### Docker
+
+ * Add a network section to [docker-compose.yml template](https://github.com/Chocobozzz/PeerTube/blob/develop/support/docker/production/docker-compose.yml) 
+and update your [.env](https://github.com/Chocobozzz/PeerTube/blob/develop/support/docker/production/.env#L8) to fix IP forwarding issue ([@Nutomic](https://github.com/nutomic))
+
+### Bug fixes
+
+ * Fix playlist block width when the player is in theater mode
+ * Reset playlist add dropdown in watch page on video change
+ * Fix follow with Mastodon
+ * Fix playlist elements reordering
+ * Fix my videos list pagination
+ * Fix video thumbnails in admin blacklist page
+ * Fix video views that are not considered
+
+
 ## v1.3.0-rc.1
 
-## IMPORTANT NOTES
+### IMPORTANT NOTES
 
  * **nginx** Remove `text/html` from `gzip_types`: https://github.com/Chocobozzz/PeerTube/commit/7eeb6a0ba4028d0e20847b846332dd0b7747c7f8 [@bnjbvr](https://github.com/bnjbvr)
  * Add `streaming_playlists` directory in configuration file. **You should configure it in your production.yaml**
  * CSP configuration changed: it's now in a [dedicated section](https://github.com/Chocobozzz/PeerTube/blob/develop/config/production.yaml.example#L110) 
  
-### Maintenance
+## Maintenance
 
  * Add GitPod support ([@jankeromnes](https://github.com/jankeromnes)) that could help people to contribute on PeerTube: https://github.com/Chocobozzz/PeerTube/blob/develop/.github/CONTRIBUTING.md#online-development
  * Add reminder to restart PeerTube in upgrade script ([@ldidry](https://github.com/ldidry))
  * Add argument to dockerfile to pass options to npm run build ([@NaPs](https://github.com/NaPs))
  * Add `NOCLIENT` env support to only install server dependencies. Example: `NOCLIENT=true yarn install --pure-lockfile` ([@rigelk](https://github.com/rigelk))
 
-## Docker
+### Docker
  
  * **Important**: Add host network mode to the reverse proxy section (without this, it could break videos views and P2P: https://github.com/Chocobozzz/PeerTube/issues/1643#issuecomment-464789666)
  * Fix SMTP default configuration ([@Nutomic](https://github.com/nutomic))
 
-## Features
+### Features
  
  * Add video playlist support
    * A user has a default `Watch-later` playlist
@@ -73,7 +91,7 @@
  * Add `Add /accounts/:username/ratings endpoint` ([@yohanboniface](https://github.com/yohanboniface))
  * Allow to control API rates limit from configuration ([@yohanboniface](https://github.com/yohanboniface))
 
-## Bug fixes
+### Bug fixes
 
  * Don't notify prior to scheduled update ([@joshmorel](https://github.com/joshmorel))
  * Fix account description database error
@@ -98,7 +116,7 @@
 
 ## v1.2.1
 
-## Bug fixes
+### Bug fixes
 
  * **Important** Fix invalid `From` email header in contact form that could lead to the blacklisting of your SMTP server
  * Fix too long display name overflow in menu
@@ -172,7 +190,7 @@
  * Increase video abuse length to 3000 characters
  * Add totalLocalVideoFilesSize in the stats endpoint
 
-## Bug fixes
+### Bug fixes
 
  * Fix the addition of captions to a video
  * Fix federation of some videos

From ea0877b405e9bf10cb488df1460ba74e2cede16e Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Wed, 22 May 2019 08:22:14 +0200
Subject: [PATCH 2/2] Bumped to version v1.3.0-rc.2

---
 client/package.json          | 2 +-
 package.json                 | 2 +-
 support/doc/api/openapi.yaml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/package.json b/client/package.json
index 4bff0a529..739b2fa63 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "peertube-client",
-  "version": "1.3.0-rc.1",
+  "version": "1.3.0-rc.2",
   "private": true,
   "licence": "GPLv3",
   "author": {
diff --git a/package.json b/package.json
index 1dbf33a0a..25c27c447 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "peertube",
   "description": "Federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.",
-  "version": "1.3.0-rc.1",
+  "version": "1.3.0-rc.2",
   "private": true,
   "licence": "AGPLv3",
   "engines": {
diff --git a/support/doc/api/openapi.yaml b/support/doc/api/openapi.yaml
index 7b67b5c64..9963e1d26 100644
--- a/support/doc/api/openapi.yaml
+++ b/support/doc/api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.0
 info:
   title: PeerTube
-  version: 1.3.0-rc.1
+  version: 1.3.0-rc.2
   contact:
     name: PeerTube Community
     url: 'https://joinpeertube.org'