gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
RiotRobot 2019-06-19 16:03:22 +01:00
parent b7a19c6d16 672cf1a46e
commit 6f1ce750bf
4 changed files with 64 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
CHANGELOG.md
View File

@ -1,3 +1,54 @@
Changes in [1.2.2](https://github.com/vector-im/riot-web/releases/tag/v1.2.2) (2019-06-19)
==========================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.2-rc.2...v1.2.2)
No changes since rc.2
Changes in [1.2.2-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.2.2-rc.2) (2019-06-18)
====================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.2-rc.1...v1.2.2-rc.2)
* Update to react-sdk and js-sdk rc.2 for registration fixes,
redaction local echo fix and removing unnecessary calls
to the integration manager.
Changes in [1.2.2-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.2.2-rc.1) (2019-06-12)
====================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.1...v1.2.2-rc.1)
* Update from Weblate
[\#10012](https://github.com/vector-im/riot-web/pull/10012)
* Add funding details for GitHub sponsor button
[\#9982](https://github.com/vector-im/riot-web/pull/9982)
* Do not fail on server liveliness checks during startup
[\#9960](https://github.com/vector-im/riot-web/pull/9960)
* Hide guest functions on the welcome page if not logged in
[\#9957](https://github.com/vector-im/riot-web/pull/9957)
* Add Albanian and West Flemish languages
[\#9953](https://github.com/vector-im/riot-web/pull/9953)
* Update from Weblate
[\#9951](https://github.com/vector-im/riot-web/pull/9951)
* Add docs for defaultCountryCode
[\#9927](https://github.com/vector-im/riot-web/pull/9927)
* Use the user's pre-existing HS when config validation fails
[\#9892](https://github.com/vector-im/riot-web/pull/9892)
* Low bandwidth mode
[\#9909](https://github.com/vector-im/riot-web/pull/9909)
* Fix Twemoji loading on Windows dev machines
[\#9869](https://github.com/vector-im/riot-web/pull/9869)
* Base Docker image on nginx:alpine, not the larger nginx:latest
[\#9848](https://github.com/vector-im/riot-web/pull/9848)
* Validate homeserver configuration prior to loading the app
[\#9779](https://github.com/vector-im/riot-web/pull/9779)
* Show resolved homeserver configuration on the mobile guide
[\#9726](https://github.com/vector-im/riot-web/pull/9726)
* Flag the validated config as the default config
[\#9721](https://github.com/vector-im/riot-web/pull/9721)
* Clarify comment on is_url and hs_url handling
[\#9719](https://github.com/vector-im/riot-web/pull/9719)
* Validate default homeserver config before loading the app
[\#9496](https://github.com/vector-im/riot-web/pull/9496)
Changes in [1.2.1](https://github.com/vector-im/riot-web/releases/tag/v1.2.1) (2019-05-31)
==========================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.0...v1.2.1)

2
electron_app/package.json
View File

@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "src/electron-main.js",
"version": "1.2.1",
"version": "1.2.2",
"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.2.1",
"version": "1.2.2",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@ -73,8 +73,8 @@
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279",
"gfm.css": "^1.1.2",
"highlight.js": "^9.13.1",
"matrix-js-sdk": "2.0.0",
"matrix-react-sdk": "1.2.1",
"matrix-js-sdk": "2.0.1",
"matrix-react-sdk": "1.2.2",
"modernizr": "^3.6.0",
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz",
"prop-types": "^15.6.2",

18
yarn.lock
View File

@ -5728,10 +5728,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.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.0.0.tgz#1bbca0170c190a42eeda739f52f2995b446225ee"
integrity sha512-2/NV9hepV8QnX3xl1oaS7VS9tqsBKqCh9/pp+dAYFMA1A5PJACMFjE2M1KnW3JvHH+uDvag4fa7rraMwwGOK+A==
matrix-js-sdk@2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.0.1.tgz#e9691c7fc142793aa8cd79e92d45698bcc5da8c4"
integrity sha512-+yj9fBdIE65v1+46TL/eLQGohtNZGBEtOD1n3nTAVBMogyVb2bpUWnqTli0ghiOCG9MKq7tWi+G4bDBTABxuxA==
dependencies:
another-json "^0.2.0"
babel-runtime "^6.26.0"
@ -5752,10 +5752,10 @@ matrix-mock-request@^1.2.3:
bluebird "^3.5.0"
expect "^1.20.2"
matrix-react-sdk@1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.2.1.tgz#18eb0fc54f4c12a6f2ab15f0920c891d12d55981"
integrity sha512-5uiwOsVTJ6uwWKzlK1Q7o95L8s+gmm5wpAXywCduCYODjINLb3d66rToLxYCsznd/qO4aAUvLT3xPSXt97ha9Q==
matrix-react-sdk@1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.2.2.tgz#09e9eae3ec3b9ef324934b69275066c667fa8a1b"
integrity sha512-K7cBzturO5+4jWWnqtuqfqHrZXuq6ckyWY/UxbNbCdsvRsO4UZz7tGBy9QSEMKhiHkqkgCaOWfSjgFgjFmCrjQ==
dependencies:
babel-plugin-syntax-dynamic-import "^6.18.0"
babel-runtime "^6.26.0"
@ -5782,7 +5782,7 @@ matrix-react-sdk@1.2.1:
linkifyjs "^2.1.6"
lodash "^4.13.1"
lolex "2.3.2"
matrix-js-sdk "2.0.0"
matrix-js-sdk "2.0.1"
optimist "^0.6.1"
pako "^1.0.5"
png-chunks-extract "^1.0.0"