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-09-12 13:07:27 +01:00
commit b0abb52518
4 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
CHANGELOG.md
View file

@ -1,3 +1,23 @@
Changes in [1.5.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.5.2) (2019-09-12)
===================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.5.2-rc.1...v1.5.2)
* Fix register page selector buttons growing too wide
[\#3427](https://github.com/matrix-org/matrix-react-sdk/pull/3427)
* Left panel: visual fixes
[\#3426](https://github.com/matrix-org/matrix-react-sdk/pull/3426)
* Hide the change HS url button on SSO login flow if custom urls disabled
[\#3425](https://github.com/matrix-org/matrix-react-sdk/pull/3425)
* RoomDirectory: show spinner if loading more results
[\#3424](https://github.com/matrix-org/matrix-react-sdk/pull/3424)
Changes in [1.5.2-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.5.2-rc.1) (2019-09-11)
=============================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.5.1...v1.5.2-rc.1)
* Merge first pass of First Time User Experience to release branch
[\#3420](https://github.com/matrix-org/matrix-react-sdk/pull/3420)
Changes in [1.5.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.5.1) (2019-08-05)
===================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.5.0-rc.1...v1.5.1)

4
package.json
View file

@ -1,6 +1,6 @@
{
"name": "matrix-react-sdk",
"version": "1.5.1",
"version": "1.5.2",
"description": "SDK for matrix.org using React",
"author": "matrix.org",
"repository": {
@ -85,7 +85,7 @@
"linkifyjs": "^2.1.6",
"lodash": "^4.17.14",
"lolex": "2.3.2",
"matrix-js-sdk": "2.3.0",
"matrix-js-sdk": "2.3.1",
"optimist": "^0.6.1",
"pako": "^1.0.5",
"png-chunks-extract": "^1.0.0",

3
src/components/views/rooms/MemberInfo.js
View file

@ -679,6 +679,9 @@ module.exports = createReactClass({
redactMessages: false,
};
// Calculate permissions for Synapse before doing the PL checks
can.synapseDeactivate = await this.context.matrixClient.isSynapseAdministrator();
const canAffectUser = them.powerLevel < me.powerLevel || isMe;
if (!canAffectUser) {
//console.log("Cannot affect user: %s >= %s", them.powerLevel, me.powerLevel);

8
yarn.lock
View file

@ -5049,10 +5049,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@2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.3.0.tgz#ed04172add2e31c532dc87e2f38c26c2a63191c6"
integrity sha512-jeswie7cWK7+XxcD+pQ7LplWnWkOQDa+x6y7FUUnxCdEvaj38cE5Obo9bPMjFgOln2hISlLdR8fzMNE9F4oUJA==
matrix-js-sdk@2.3.1:
version "2.3.1"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.3.1.tgz#c0ebe90d43611cf28422317ec0c04f5d41acb2ad"
integrity sha512-lf2pGHp0o4bDVrSZ5ReLAkMMiX9PngGMxNAtzztdDvQ20lfYZvhwif9PUbi3tt8kwXlfs7s34eWxz5Rg37mdGg==
dependencies:
another-json "^0.2.0"
babel-runtime "^6.26.0"