PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' into develop

Browse source
This commit is contained in:
RiotRobot 2019-11-04 15:20:47 +00:00
commit 9b7e03d557
4 changed files with 59 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
CHANGELOG.md
View file

@ -1,3 +1,49 @@
Changes in [1.5.1](https://github.com/vector-im/riot-web/releases/tag/v1.5.1) (2019-11-04)
==========================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.1-rc.2...v1.5.1)
* No changes since rc.2
Changes in [1.5.1-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.5.1-rc.2) (2019-11-01)
====================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.1-rc.1...v1.5.1-rc.2)
* Updated react-sdk with fix for bug that caused room filtering to
omit results.
Changes in [1.5.1-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.5.1-rc.1) (2019-10-30)
====================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.0...v1.5.1-rc.1)
* Add ability to hide tray icon on non-Mac (which has no tray icon)
[\#11258](https://github.com/vector-im/riot-web/pull/11258)
* Fix bug preventing display from sleeping after a call
[\#11264](https://github.com/vector-im/riot-web/pull/11264)
* Remove mention of CI scripts from docs
[\#11257](https://github.com/vector-im/riot-web/pull/11257)
* Fix skinning replaces being broken since being rewritten as React FC's
[\#11254](https://github.com/vector-im/riot-web/pull/11254)
* Update config docs about identity servers
[\#11249](https://github.com/vector-im/riot-web/pull/11249)
* Remove unneeded help about identity servers
[\#11248](https://github.com/vector-im/riot-web/pull/11248)
* Update from Weblate
[\#11243](https://github.com/vector-im/riot-web/pull/11243)
* Update sample config for new matrix.org CS API URL
[\#11207](https://github.com/vector-im/riot-web/pull/11207)
* clarify where the e2e tests are located
[\#11115](https://github.com/vector-im/riot-web/pull/11115)
* Update from Weblate
[\#11171](https://github.com/vector-im/riot-web/pull/11171)
* Prevent referrers from being sent
[\#6155](https://github.com/vector-im/riot-web/pull/6155)
* Add darkModeSupport to allow dark themed title bar.
[\#11140](https://github.com/vector-im/riot-web/pull/11140)
* Fix the label of Turkish language
[\#11124](https://github.com/vector-im/riot-web/pull/11124)
* Update default HS config to match well-known
[\#11112](https://github.com/vector-im/riot-web/pull/11112)
Changes in [1.5.0](https://github.com/vector-im/riot-web/releases/tag/v1.5.0) (2019-10-18)
==========================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.0-rc.1...v1.5.0)

2
electron_app/package.json
View file

@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "src/electron-main.js",
"version": "1.5.0",
"version": "1.5.1",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"dependencies": {

6
package.json
View file

@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "electron_app/src/electron-main.js",
"version": "1.5.0",
"version": "1.5.1",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@ -74,8 +74,8 @@
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566",
"gfm.css": "^1.1.2",
"highlight.js": "^9.13.1",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
"matrix-js-sdk": "2.4.3",
"matrix-react-sdk": "1.7.1",
"modernizr": "^3.6.0",
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
"prop-types": "^15.7.2",

16
yarn.lock
View file

@ -5950,9 +5950,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@github:matrix-org/matrix-js-sdk#develop":
version "2.4.2"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/46d7e4c7075386f1330d6a49941e9979fc26be0a"
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==
dependencies:
another-json "^0.2.0"
babel-runtime "^6.26.0"
@ -5973,9 +5974,10 @@ matrix-mock-request@^1.2.3:
bluebird "^3.5.0"
expect "^1.20.2"
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
version "1.7.0"
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/53332018234fc9067c6200babb794ab3538a0791"
matrix-react-sdk@1.7.1:
version "1.7.1"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.7.1.tgz#279b556dd24aae1ff13d10b261521055cdf9c7e4"
integrity sha512-y5sOCMHZvZRyWcJnaK5bk6oiq6hIO3bSJy3GNqL8yRozt3CPZzHDG9ripf3EQ+hmGilKV9sfPZw173CxZROwDw==
dependencies:
babel-plugin-syntax-dynamic-import "^6.18.0"
babel-runtime "^6.26.0"
@ -6006,7 +6008,7 @@ matrix-mock-request@^1.2.3:
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.3"
optimist "^0.6.1"
pako "^1.0.5"
png-chunks-extract "^1.0.0"