Merge branch 'master' into develop
This commit is contained in:
RiotRobot
commit
e71fcc33f9
35
CHANGELOG.md
35
CHANGELOG.md
|
|
@ -1,3 +1,38 @@
|
|||
Changes in [1.3.0](https://github.com/vector-im/riot-web/releases/tag/v1.3.0) (2019-07-18)
|
||||
==========================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.0-rc.3...v1.3.0)
|
||||
|
||||
* Upgrade to React SDK 1.4.0 and JS SDK 2.2.0
|
||||
* Message editing and reactions features enabled
|
||||
* Remove edits and reactions feature flags from docs and config
|
||||
[\#10365](https://github.com/vector-im/riot-web/pull/10365)
|
||||
|
||||
Changes in [1.3.0-rc.3](https://github.com/vector-im/riot-web/releases/tag/v1.3.0-rc.3) (2019-07-15)
|
||||
====================================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.0-rc.2...v1.3.0-rc.3)
|
||||
|
||||
* Update to react-sdk rc.3 to fix a bug where a room admin could generate a room
|
||||
that would cause Riot to error, and some stuck notifications.
|
||||
|
||||
Changes in [1.3.0-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.3.0-rc.2) (2019-07-12)
|
||||
====================================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.0-rc.1...v1.3.0-rc.2)
|
||||
|
||||
* Upgrade to React SDK 1.4.0-rc.2 and JS SDK 2.2.0-rc.2
|
||||
* Fix regression from Riot 1.3.0-rc.1 when listing devices in user settings
|
||||
|
||||
Changes in [1.3.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.3.0-rc.1) (2019-07-12)
|
||||
====================================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.4...v1.3.0-rc.1)
|
||||
|
||||
* Upgrade to React SDK 1.4.0-rc.1 and JS SDK 2.2.0-rc.1
|
||||
* Update from Weblate
|
||||
[\#10328](https://github.com/vector-im/riot-web/pull/10328)
|
||||
* Upgrade dependencies
|
||||
[\#10308](https://github.com/vector-im/riot-web/pull/10308)
|
||||
* Upgrade dependencies
|
||||
[\#10260](https://github.com/vector-im/riot-web/pull/10260)
|
||||
|
||||
Changes in [1.2.4](https://github.com/vector-im/riot-web/releases/tag/v1.2.4) (2019-07-11)
|
||||
==========================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.3...v1.2.4)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
"name": "riot-web",
|
||||
"productName": "Riot",
|
||||
"main": "src/electron-main.js",
|
||||
"version": "1.2.4",
|
||||
"version": "1.3.0",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "New Vector Ltd.",
|
||||
"dependencies": {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
"name": "riot-web",
|
||||
"productName": "Riot",
|
||||
"main": "electron_app/src/electron-main.js",
|
||||
"version": "1.2.4",
|
||||
"version": "1.3.0",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "New Vector Ltd.",
|
||||
"repository": {
|
||||
|
|
@ -74,8 +74,8 @@
|
|||
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279",
|
||||
"gfm.css": "^1.1.2",
|
||||
"highlight.js": "^9.13.1",
|
||||
"matrix-js-sdk": "2.1.1",
|
||||
"matrix-react-sdk": "1.3.1",
|
||||
"matrix-js-sdk": "2.2.0",
|
||||
"matrix-react-sdk": "1.4.0",
|
||||
"modernizr": "^3.6.0",
|
||||
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz",
|
||||
"prop-types": "^15.6.2",
|
||||
|
|
|
|||
18
yarn.lock
18
yarn.lock
|
|
@ -5847,10 +5847,10 @@ math-random@^1.0.1:
|
|||
resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
|
||||
integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
|
||||
|
||||
matrix-js-sdk@2.1.1:
|
||||
version "2.1.1"
|
||||
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.1.1.tgz#c4d9ed81e18e2c2fce9fff168fdf41f37c390b6a"
|
||||
integrity sha512-dpVuwrQjOJn8eqtP9TRoSX6WIbdZG7+RCmqkJtfvpjB+iNgtDhodIWfrNearSBhJYezipUFu9nrt9akKfWBXxQ==
|
||||
matrix-js-sdk@2.2.0:
|
||||
version "2.2.0"
|
||||
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.2.0.tgz#c96a2caa4c92e5998443027579d7e76d4bcd4d21"
|
||||
integrity sha512-gab7wuscgTKbXY5x136t9qSnDbOuq785ezd++NoFLEau0YjDos0YKolAm0TValUC9LY30CoVqqMfyPJ68CMezQ==
|
||||
dependencies:
|
||||
another-json "^0.2.0"
|
||||
babel-runtime "^6.26.0"
|
||||
|
|
@ -5871,10 +5871,10 @@ matrix-mock-request@^1.2.3:
|
|||
bluebird "^3.5.0"
|
||||
expect "^1.20.2"
|
||||
|
||||
matrix-react-sdk@1.3.1:
|
||||
version "1.3.1"
|
||||
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.3.1.tgz#47bcb451684e09c7306db9751000e4c5af713bb7"
|
||||
integrity sha512-qQ9O7sBkcTWbUUkv82fSZVXyXVNkL9WJkWqrAlzTUzf8pzVENqtKunQeDbrfzuYan2bHre+ot14KFwSkywOhcw==
|
||||
matrix-react-sdk@1.4.0:
|
||||
version "1.4.0"
|
||||
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.4.0.tgz#dd7a6b9f73355174eeba37ce4ae4eb8bba98d57d"
|
||||
integrity sha512-kZIkTU4tYNzOJX0hcWRWiyswuHJBP2svnbDg+GvCXFsDKZM566G3Hg5gU11QFVFAmQokO3DVazpQi6nlKt5dCg==
|
||||
dependencies:
|
||||
babel-plugin-syntax-dynamic-import "^6.18.0"
|
||||
babel-runtime "^6.26.0"
|
||||
|
|
@ -5901,7 +5901,7 @@ matrix-react-sdk@1.3.1:
|
|||
linkifyjs "^2.1.6"
|
||||
lodash "^4.17.14"
|
||||
lolex "2.3.2"
|
||||
matrix-js-sdk "2.1.1"
|
||||
matrix-js-sdk "2.2.0"
|
||||
optimist "^0.6.1"
|
||||
pako "^1.0.5"
|
||||
png-chunks-extract "^1.0.0"
|
||||
|
|
|
|||
Loading…
Reference in New Issue