From 1334e0ae0db07987424402e03d0bfaabc7f1f540 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 3 Feb 2017 15:27:51 +0000 Subject: [PATCH 1/7] Prep changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f58918c44..92118263a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +unreleased +========== + * Fix deviceverifybuttons + [5fd7410](https://github.com/matrix-org/matrix-react-sdk/commit/827b5a6811ac6b9d1f9a3002a94f9f6ac3f1d49c) + Changes in [0.8.6-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.8.6-rc.2) (2017-02-03) ============================================================================================================= [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.8.6-rc.1...v0.8.6-rc.2) From c52ae8ff01624e556fa2b0e0833fe040f589c894 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 3 Feb 2017 15:28:03 +0000 Subject: [PATCH 2/7] Bump to js-sdk 0.7.5-rc.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 815d692eaf..697f73b4ff 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "isomorphic-fetch": "^2.2.1", "linkifyjs": "^2.1.3", "lodash": "^4.13.1", - "matrix-js-sdk": "0.7.5-rc.2", + "matrix-js-sdk": "0.7.5-rc.3", "optimist": "^0.6.1", "q": "^1.4.1", "react": "^15.4.0", From aa164bf54ca208b09f1676cf2e00053bd954721d Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 3 Feb 2017 15:32:37 +0000 Subject: [PATCH 3/7] Prepare changelog for v0.8.6-rc.3 --- CHANGELOG.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 92118263a3..092cf73626 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,11 @@ -unreleased -========== +Changes in [0.8.6-rc.3](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.8.6-rc.3) (2017-02-03) +============================================================================================================= +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.8.6-rc.2...v0.8.6-rc.3) + * Fix deviceverifybuttons [5fd7410](https://github.com/matrix-org/matrix-react-sdk/commit/827b5a6811ac6b9d1f9a3002a94f9f6ac3f1d49c) + Changes in [0.8.6-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.8.6-rc.2) (2017-02-03) ============================================================================================================= [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.8.6-rc.1...v0.8.6-rc.2) From 19b0f956d2dd4195f364bf77bc751150c580ac75 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 3 Feb 2017 15:32:37 +0000 Subject: [PATCH 4/7] v0.8.6-rc.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 697f73b4ff..047afd8352 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "0.8.6-rc.2", + "version": "0.8.6-rc.3", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": { From 39488f294bc0d43f87597e1ee5b21892f075865b Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Sat, 4 Feb 2017 10:23:56 +0000 Subject: [PATCH 5/7] bump to js-sdk 0.7.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 047afd8352..dee58fd792 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "isomorphic-fetch": "^2.2.1", "linkifyjs": "^2.1.3", "lodash": "^4.13.1", - "matrix-js-sdk": "0.7.5-rc.3", + "matrix-js-sdk": "0.7.5", "optimist": "^0.6.1", "q": "^1.4.1", "react": "^15.4.0", From 04bbf0a26b398a4da689188de70cbeef593dbda8 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Sat, 4 Feb 2017 10:30:15 +0000 Subject: [PATCH 6/7] Prepare changelog for v0.8.6 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 092cf73626..488a9814e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,14 @@ +Changes in [0.8.6](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.8.6) (2017-02-04) +=================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.8.6-rc.3...v0.8.6) + + * Update to matrix-js-sdk 0.7.5 (no changes from 0.7.5-rc.3) + Changes in [0.8.6-rc.3](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.8.6-rc.3) (2017-02-03) ============================================================================================================= [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.8.6-rc.2...v0.8.6-rc.3) + * Update to matrix-js-sdk 0.7.5-rc.3 * Fix deviceverifybuttons [5fd7410](https://github.com/matrix-org/matrix-react-sdk/commit/827b5a6811ac6b9d1f9a3002a94f9f6ac3f1d49c) From a9cd1bfd4b23338d9b895ac57e19a116843b7895 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Sat, 4 Feb 2017 10:30:16 +0000 Subject: [PATCH 7/7] v0.8.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dee58fd792..95bfafbb74 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "0.8.6-rc.3", + "version": "0.8.6", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": {