Merge branch 'master' into develop
This commit is contained in:
RiotRobot
commit
acd7e028d5
4 changed files with 77 additions and 14 deletions
56
CHANGELOG.md
56
CHANGELOG.md
|
|
@ -1,3 +1,59 @@
|
|||
Changes in [1.5.4](https://github.com/vector-im/riot-web/releases/tag/v1.5.4) (2019-11-25)
|
||||
==========================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.4-rc.2...v1.5.4)
|
||||
|
||||
* No changes since rc.2
|
||||
|
||||
Changes in [1.5.4-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.5.4-rc.2) (2019-11-22)
|
||||
====================================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.4-rc.1...v1.5.4-rc.2)
|
||||
|
||||
* react-sdk rc.2 to fix an error in Safari and some cosmetic
|
||||
bugs
|
||||
|
||||
Changes in [1.5.4-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.5.4-rc.1) (2019-11-20)
|
||||
====================================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.3...v1.5.4-rc.1)
|
||||
|
||||
* Add doc for custom themes
|
||||
[\#11444](https://github.com/vector-im/riot-web/pull/11444)
|
||||
* Use new theme API in react-sdk
|
||||
[\#11442](https://github.com/vector-im/riot-web/pull/11442)
|
||||
* preload warning triangle
|
||||
[\#11441](https://github.com/vector-im/riot-web/pull/11441)
|
||||
* Update from Weblate
|
||||
[\#11440](https://github.com/vector-im/riot-web/pull/11440)
|
||||
* Add entitlements file for mic & camera permissions on macOS
|
||||
[\#11435](https://github.com/vector-im/riot-web/pull/11435)
|
||||
* Fix error/exception in electron signing script
|
||||
[\#11429](https://github.com/vector-im/riot-web/pull/11429)
|
||||
* Merge the `feature_user_info_panel` flag into `feature_dm_verification`
|
||||
[\#11426](https://github.com/vector-im/riot-web/pull/11426)
|
||||
* Let the user's homeserver config override the build config
|
||||
[\#11409](https://github.com/vector-im/riot-web/pull/11409)
|
||||
* Add cross-signing labs flag to develop and document
|
||||
[\#11408](https://github.com/vector-im/riot-web/pull/11408)
|
||||
* Update from Weblate
|
||||
[\#11405](https://github.com/vector-im/riot-web/pull/11405)
|
||||
* Trigger a theme change on startup, not just a tint change
|
||||
[\#11381](https://github.com/vector-im/riot-web/pull/11381)
|
||||
* Perform favicon updates twice in Chrome
|
||||
[\#11375](https://github.com/vector-im/riot-web/pull/11375)
|
||||
* Add labs documentation for Mjolnir
|
||||
[\#11275](https://github.com/vector-im/riot-web/pull/11275)
|
||||
* Add description of user info feature in labs doc
|
||||
[\#11360](https://github.com/vector-im/riot-web/pull/11360)
|
||||
* Update from Weblate
|
||||
[\#11359](https://github.com/vector-im/riot-web/pull/11359)
|
||||
* Add DM verification feature to labs.md
|
||||
[\#11356](https://github.com/vector-im/riot-web/pull/11356)
|
||||
* Add feature_dm_verification to labs
|
||||
[\#11355](https://github.com/vector-im/riot-web/pull/11355)
|
||||
* Document feature flag process
|
||||
[\#11341](https://github.com/vector-im/riot-web/pull/11341)
|
||||
* Remove unused feature flags
|
||||
[\#11343](https://github.com/vector-im/riot-web/pull/11343)
|
||||
|
||||
Changes in [1.5.3](https://github.com/vector-im/riot-web/releases/tag/v1.5.3) (2019-11-06)
|
||||
==========================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.2...v1.5.3)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
"name": "riot-web",
|
||||
"productName": "Riot",
|
||||
"main": "src/electron-main.js",
|
||||
"version": "1.5.3",
|
||||
"version": "1.5.4",
|
||||
"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.5.3",
|
||||
"version": "1.5.4",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "New Vector Ltd.",
|
||||
"repository": {
|
||||
|
|
@ -73,8 +73,8 @@
|
|||
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566",
|
||||
"gfm.css": "^1.1.2",
|
||||
"highlight.js": "^9.13.1",
|
||||
"matrix-js-sdk": "2.4.3",
|
||||
"matrix-react-sdk": "1.7.2",
|
||||
"matrix-js-sdk": "2.4.4",
|
||||
"matrix-react-sdk": "1.7.3",
|
||||
"modernizr": "^3.6.0",
|
||||
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
|
||||
"prop-types": "^15.7.2",
|
||||
|
|
|
|||
27
yarn.lock
27
yarn.lock
|
|
@ -3354,7 +3354,7 @@ es6-promisify@^5.0.0:
|
|||
dependencies:
|
||||
es6-promise "^4.0.3"
|
||||
|
||||
escape-html@~1.0.3:
|
||||
escape-html@^1.0.3, escape-html@~1.0.3:
|
||||
version "1.0.3"
|
||||
resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
|
||||
integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
|
||||
|
|
@ -4291,6 +4291,11 @@ glob-to-regexp@^0.3.0:
|
|||
resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
|
||||
integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
|
||||
|
||||
glob-to-regexp@^0.4.1:
|
||||
version "0.4.1"
|
||||
resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
|
||||
integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
|
||||
|
||||
glob2base@^0.0.12:
|
||||
version "0.0.12"
|
||||
resolved "https://registry.yarnpkg.com/glob2base/-/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56"
|
||||
|
|
@ -6004,10 +6009,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.4.3:
|
||||
version "2.4.3"
|
||||
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.3.tgz#23b78cc707a02eb0ce7eecb3aa50129e46dd5b6e"
|
||||
integrity sha512-8qTqILd/NmTWF24tpaxmDIzkTk/bZhPD5N8h69PlvJ5Y6kMFctpRj+Tud5zZjl5/yhO07+g+JCyDzg+AagiM/A==
|
||||
matrix-js-sdk@2.4.4:
|
||||
version "2.4.4"
|
||||
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.4.tgz#d5e2d6fbe938c4275a1423a5f09330d33517ce3f"
|
||||
integrity sha512-wSaRFvhWvwEzVaEkyBGo5ReumvaM5OrC1MJ6SVlyoLwH/WRPEXcUlu+rUNw5TFVEAH4TAVHXf/SVRBiR0j5nSQ==
|
||||
dependencies:
|
||||
another-json "^0.2.0"
|
||||
babel-runtime "^6.26.0"
|
||||
|
|
@ -6028,10 +6033,10 @@ matrix-mock-request@^1.2.3:
|
|||
bluebird "^3.5.0"
|
||||
expect "^1.20.2"
|
||||
|
||||
matrix-react-sdk@1.7.2:
|
||||
version "1.7.2"
|
||||
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.7.2.tgz#4c16fa6c2d188311ecb5163773dfdf7ca92b7ecc"
|
||||
integrity sha512-CWCr41sRBeUChlvec6eJxmY02g+Re6PN3lt9tR7TkqGKyUu++Y72WPfirM+0t11QVtVyZ5Wo1WIzpropLBFyYw==
|
||||
matrix-react-sdk@1.7.3:
|
||||
version "1.7.3"
|
||||
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.7.3.tgz#f3f64dc77eea64b77ba3d574847bc03146d421a3"
|
||||
integrity sha512-XSZSj4GWhxhoEoCIHGyMwBKdmcHJrKB9hToHJQTI0OL/x8+ErTLVAgJYW8hvR16l5lXGzSsYWDOfQOTbKK1tLQ==
|
||||
dependencies:
|
||||
babel-plugin-syntax-dynamic-import "^6.18.0"
|
||||
babel-runtime "^6.26.0"
|
||||
|
|
@ -6047,6 +6052,7 @@ matrix-react-sdk@1.7.2:
|
|||
diff-match-patch "^1.0.4"
|
||||
emojibase-data "^4.0.2"
|
||||
emojibase-regex "^3.0.0"
|
||||
escape-html "^1.0.3"
|
||||
file-saver "^1.3.3"
|
||||
filesize "3.5.6"
|
||||
flux "2.1.1"
|
||||
|
|
@ -6056,13 +6062,14 @@ matrix-react-sdk@1.7.2:
|
|||
gemini-scrollbar "github:matrix-org/gemini-scrollbar#91e1e566"
|
||||
gfm.css "^1.1.1"
|
||||
glob "^5.0.14"
|
||||
glob-to-regexp "^0.4.1"
|
||||
highlight.js "^9.15.8"
|
||||
is-ip "^2.0.0"
|
||||
isomorphic-fetch "^2.2.1"
|
||||
linkifyjs "^2.1.6"
|
||||
lodash "^4.17.14"
|
||||
lolex "4.2"
|
||||
matrix-js-sdk "2.4.3"
|
||||
matrix-js-sdk "2.4.4"
|
||||
optimist "^0.6.1"
|
||||
pako "^1.0.5"
|
||||
png-chunks-extract "^1.0.0"
|
||||
|
|
|
|||
Loading…
Reference in a new issue