OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into develop

pull/21833/head
RiotRobot 2019-10-18 14:49:40 +01:00
parent 96db855e48 86a564b2f0
commit d05ef40694
3 changed files with 65 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
CHANGELOG.md
View File

@ -1,3 +1,62 @@
Changes in [1.7.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.7.0) (2019-10-18)
===================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.7.0-rc.1...v1.7.0)
* Upgrade to JS SDK v2.4.2
* Fix: edit unmount when no selection
[\#3545](https://github.com/matrix-org/matrix-react-sdk/pull/3545)
* "SettingsFlag always run ToggleSwitch fully controlled" to release
[\#3542](https://github.com/matrix-org/matrix-react-sdk/pull/3542)
Changes in [1.7.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.7.0-rc.1) (2019-10-09)
=============================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.6.2...v1.7.0-rc.1)
* Update from Weblate
[\#3539](https://github.com/matrix-org/matrix-react-sdk/pull/3539)
* React error/warning cleanup
[\#3529](https://github.com/matrix-org/matrix-react-sdk/pull/3529)
* Add label to rageshakes for React soft crashes
[\#3535](https://github.com/matrix-org/matrix-react-sdk/pull/3535)
* Support UI Auth on adding email addresses & phone numbers
[\#3534](https://github.com/matrix-org/matrix-react-sdk/pull/3534)
* Unmount React components before stopping the client
[\#3533](https://github.com/matrix-org/matrix-react-sdk/pull/3533)
* Fix soft crash on room join
[\#3532](https://github.com/matrix-org/matrix-react-sdk/pull/3532)
* Fix: Unable to verify email address error
[\#3528](https://github.com/matrix-org/matrix-react-sdk/pull/3528)
* Fix: submit create room dialog when pressing enter
[\#3509](https://github.com/matrix-org/matrix-react-sdk/pull/3509)
* Allow cyclic objects in console logs
[\#3531](https://github.com/matrix-org/matrix-react-sdk/pull/3531)
* Fix: watch emoticon autoreplace setting
[\#3530](https://github.com/matrix-org/matrix-react-sdk/pull/3530)
* Make "remove recent messages" more robust
[\#3508](https://github.com/matrix-org/matrix-react-sdk/pull/3508)
* Label submit button in UI auth password prompt
[\#3527](https://github.com/matrix-org/matrix-react-sdk/pull/3527)
* Null-guard the recaptcha setup
[\#3526](https://github.com/matrix-org/matrix-react-sdk/pull/3526)
* Use a mask instead of an img for "Show image" eye
[\#3513](https://github.com/matrix-org/matrix-react-sdk/pull/3513)
* Only limit the rageshake log size in one place
[\#3523](https://github.com/matrix-org/matrix-react-sdk/pull/3523)
* Rename UPPER_CAMEL_CASE to UPPER_SNAKE_CASE in Coding Style
[\#3525](https://github.com/matrix-org/matrix-react-sdk/pull/3525)
* Revert "Run yarn upgrade"
[\#3524](https://github.com/matrix-org/matrix-react-sdk/pull/3524)
* Run yarn upgrade
[\#3521](https://github.com/matrix-org/matrix-react-sdk/pull/3521)
* Limit Backspace-consuming workaround to just Slate, tidy Keyboard :)
[\#3522](https://github.com/matrix-org/matrix-react-sdk/pull/3522)
* Enable CIDER composer by default
[\#3519](https://github.com/matrix-org/matrix-react-sdk/pull/3519)
* Update from Weblate
[\#3520](https://github.com/matrix-org/matrix-react-sdk/pull/3520)
* Cull some easily fixable errors which make the console a mess
[\#3516](https://github.com/matrix-org/matrix-react-sdk/pull/3516)
Changes in [1.6.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.6.2) (2019-10-04)
===================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.6.2-rc.1...v1.6.2)

4
package.json
View File

@ -1,6 +1,6 @@
{
"name": "matrix-react-sdk",
"version": "1.6.2",
"version": "1.7.0",
"description": "SDK for matrix.org using React",
"author": "matrix.org",
"repository": {
@ -86,7 +86,7 @@
"linkifyjs": "^2.1.6",
"lodash": "^4.17.14",
"lolex": "4.2",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-js-sdk": "2.4.2",
"optimist": "^0.6.1",
"pako": "^1.0.5",
"png-chunks-extract": "^1.0.0",

7
yarn.lock
View File

@ -5187,9 +5187,10 @@ mathml-tag-names@^2.0.1:
resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc"
integrity sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw==
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "2.4.1"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/e024d047e358cf26caa47542c8f6d9a469a11cb2"
matrix-js-sdk@2.4.2:
version "2.4.2"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.2.tgz#e9c3c929469e0d885463d22f927f7ac38ad5f209"
integrity sha512-DkkUk6IX56Pkz9S7RYLn2XeTRVMrLiFOAavZvzWHs/m+k8JFtjDmJ8JVJLDA12+kL9h6rXYDN80/99RfFZH3hA==
dependencies:
another-json "^0.2.0"
babel-runtime "^6.26.0"