From 69ec73bf4641bd11ebd726cf5809d7222a7152af Mon Sep 17 00:00:00 2001
From: Samuel Paccoud - FUN MOOC <samuel.paccoud@fun-mooc.fr>
Date: Tue, 15 Jan 2019 14:19:42 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=96(patch)=20bump=20release=20to=201.2?=
 =?UTF-8?q?.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added

- Add automatic portability between consumer sites for friend websites or
  different environments of the same website,
- Enforce either the `consumer site` or the `playlist` field is set on a LTI
  passport, and not both,
- Improve admin pages for the playlist and video models,
- Add unicity constraints on the playlist and video models,
- Improve string representation for the a playlist model.

Fixed

- Improve test to secure portability of a video to the same playlist on
  another site, making sure it has precedence over a video linked to another
  playlist on the other site,
- Isolate route definitions to avoid circular dependencies in the frontend,
- Add unicity test timed text tracks to confirm soft deleted records are
  ignored,
- Copy related tracks correctly when duplicating a video,
- Replace the `upload-policy` API endpoint by `initiate-upload` that reset the
  upload state and returns the AWS S3 upload policy in a single POST query,
- Add field `is_ready_to_play` to compensate removing field `state`,
- Rename `state` field to `upload_state` as it does not represent the state of
  the object nymore but the state of the latest upload attempted on this
  object,
- Enforce read-only on `upload_state` and `active_stamp` fields as they should
  only be updated by AWS via the `update-state` API endpoint.
---
 CHANGELOG.md              | 12 ++++++++----
 src/backend/setup.cfg     |  2 +-
 src/frontend/package.json |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 815affbdc6..e0a07130e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,10 +8,12 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [1.2.0] - 2019-01-15
+
 ### Added
 
 - Add automatic portability between consumer sites for friend websites or different environments
-  of the same website.
+  of the same website
 - Enforce either the `consumer site` or the `playlist` field is set on a LTI
   passport, and not both
 - Improve admin pages for the playlist and video models
@@ -21,7 +23,8 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 ### Fixed
 
 - Improve test to secure portability of a video to the same playlist on another site, making sure
-  it has precedence over a video linked to another playlist on the other site.
+  it has precedence over a video linked to another playlist on the other site
+- Isolate route definitions to avoid circular dependencies in the frontend
 - Add unicity test timed text tracks to confirm soft deleted records are ignored
 - Copy related tracks correctly when duplicating a video
 - Replace the `upload-policy` API endpoint by `initiate-upload` that reset the upload
@@ -30,7 +33,7 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 - Rename `state` field to `upload_state` as it does not represent the state of the object
   anymore but the state of the latest upload attempted on this object
 - Enforce read-only on `upload_state` and `active_stamp` fields as they should only be
-  updated by AWS via the `update-state` API endpoint.
+  updated by AWS via the `update-state` API endpoint
 
 ## [1.1.2] - 2019-01-11
 
@@ -69,7 +72,8 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 - Minor fixes and improvements on features and tests
 
-[unreleased]: https://github.com/openfun/marsha/compare/v1.1.2...master
+[unreleased]: https://github.com/openfun/marsha/compare/v1.2.0...master
+[1.2.0]: https://github.com/openfun/marsha/compare/v1.1.2...v1.2.0
 [1.1.2]: https://github.com/openfun/marsha/compare/v1.1.1...v1.1.2
 [1.1.1]: https://github.com/openfun/marsha/compare/v1.1.0...v1.1.1
 [1.1.0]: https://github.com/openfun/marsha/compare/v1.0.0...v1.1.0
diff --git a/src/backend/setup.cfg b/src/backend/setup.cfg
index 5d6279be5a..eaf35e7e27 100644
--- a/src/backend/setup.cfg
+++ b/src/backend/setup.cfg
@@ -2,7 +2,7 @@
 name = marsha
 description = A FUN video provider for Open edX
 long_description = file:README.rst
-version = 1.1.2
+version = 1.2.0
 author = Open FUN (France Universite Numerique)
 author_email = fun.dev@fun-mooc.fr
 license = MIT
diff --git a/src/frontend/package.json b/src/frontend/package.json
index 1cbe40ea47..e35d909c2d 100644
--- a/src/frontend/package.json
+++ b/src/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "marsha",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "🐠 a FUN LTI video provider",
   "main": "front/index.tsx",
   "scripts": {