Compare commits

..

20 Commits

Author SHA1 Message Date
RiotRobot
9c9da4345b v1.7.1 2020-07-16 16:15:39 +01:00
RiotRobot
eed6a01efa Prepare changelog for v1.7.1 2020-07-16 16:15:38 +01:00
RiotRobot
0159699d1b Upgrade matrix-react-sdk to 2.10.1 2020-07-16 16:13:15 +01:00
RiotRobot
1262a1ef08 Upgrade matrix-js-sdk to 7.1.0 2020-07-16 16:12:35 +01:00
Travis Ralston
8e67450477 Merge pull request #14544 from vector-im/travis/fix-sso2
Fix SSO session ID paramater
2020-07-16 08:13:58 -06:00
Travis Ralston
b2d4432ba9 Fix SSO session ID paramater 2020-07-16 08:11:04 -06:00
J. Ryan Stinnett
efa603939b Merge pull request #14488 from jaller94/j94/pngcrush
Run pngcrush on vector-icons
2020-07-16 14:06:25 +01:00
David Baker
a1c06c5a0e Merge pull request #14502 from vector-im/dbkr/hostinglink
Fix hosting signup link
2020-07-16 09:30:19 +01:00
Travis Ralston
8eac445ddc Merge pull request #14513 from vector-im/travis/fix-sso
Use the right protocol for SSO URLs
2020-07-15 19:48:17 -06:00
Travis Ralston
1b60743910 Use the right protocol for SSO URLs 2020-07-15 17:05:17 -06:00
David Baker
1a49459b81 Apparently we have changed this 2020-07-15 20:04:17 +01:00
David Baker
62d1e4937c Fix hosting signup link
Fixes https://github.com/vector-im/riot-web/issues/14500
2020-07-15 19:58:34 +01:00
J. Ryan Stinnett
636529bb36 Merge pull request #14485 from jaller94/j94/fix-mstile-310-150
Fix mstile-310x150 by renaming it
2020-07-15 16:54:32 +01:00
Christian Paul
37126b3f76 Run pngcrush on vector-icons 2020-07-15 16:58:17 +02:00
Christian Paul
16726c7e16 Add pixels left and right for mstile-310x150.png to be 310x150 2020-07-15 16:54:01 +02:00
David Baker
bfc62e04f0 Merge pull request #14478 from vector-im/hs/blog-and-twitter-links
Update blog and twitter links to point to Element
2020-07-15 15:01:53 +01:00
Christian Paul
2bcadfab83 Fix mstile-310x150 by renaming it 2020-07-15 15:52:29 +02:00
Will Hunt
d04e0f441d Update blog and twitter links 2020-07-15 13:23:51 +01:00
RiotRobot
7c17272c83 Reset matrix-react-sdk back to develop branch 2020-07-15 12:14:38 +01:00
RiotRobot
6886dbcbd4 Reset matrix-js-sdk back to develop branch 2020-07-15 12:14:27 +01:00
34 changed files with 30 additions and 12 deletions

View File

@@ -1,3 +1,21 @@
Changes in [1.7.1](https://github.com/vector-im/riot-web/releases/tag/v1.7.1) (2020-07-16)
==========================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.7.0...v1.7.1)
* Upgrade to React SDK 2.10.1
* Fix SSO session ID paramater
[\#14544](https://github.com/vector-im/riot-web/pull/14544)
* Run pngcrush on vector-icons
[\#14488](https://github.com/vector-im/riot-web/pull/14488)
* Fix hosting signup link
[\#14502](https://github.com/vector-im/riot-web/pull/14502)
* Use the right protocol for SSO URLs
[\#14513](https://github.com/vector-im/riot-web/pull/14513)
* Fix mstile-310x150 by renaming it
[\#14485](https://github.com/vector-im/riot-web/pull/14485)
* Update blog and twitter links to point to Element
[\#14478](https://github.com/vector-im/riot-web/pull/14478)
Changes in [1.7.0](https://github.com/vector-im/riot-web/releases/tag/v1.7.0) (2020-07-15)
==========================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.8...v1.7.0)

View File

@@ -10,7 +10,7 @@
"https://scalar-staging.vector.im/api",
"https://scalar-staging.riot.im/scalar/api"
],
"hosting_signup_link": "https://modular.im/services/matrix-hosting-riot?utm_source=riot-web&utm_medium=web",
"hosting_signup_link": "https://element.io/matrix-services?utm_source=element-web&utm_medium=web",
"bug_report_endpoint_url": "https://riot.im/bugreports/submit",
"features": {
},

View File

@@ -10,7 +10,7 @@
"https://scalar-staging.vector.im/api",
"https://scalar-staging.riot.im/scalar/api"
],
"hosting_signup_link": "https://modular.im/services/matrix-hosting-riot?utm_source=riot-web&utm_medium=web",
"hosting_signup_link": "https://element.io/matrix-services?utm_source=element-web&utm_medium=web",
"bug_report_endpoint_url": "https://riot.im/bugreports/submit",
"features": {
"feature_new_spinner": "labs",

View File

@@ -1,7 +1,7 @@
{
"name": "riot-web",
"productName": "Riot",
"version": "1.7.0",
"version": "1.7.1",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@@ -61,7 +61,7 @@
"gfm.css": "^1.1.2",
"highlight.js": "^9.13.1",
"matrix-js-sdk": "7.1.0",
"matrix-react-sdk": "2.10.0",
"matrix-react-sdk": "2.10.1",
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
"postcss-easings": "^2.0.0",
"prop-types": "^15.7.2",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 651 B

After

Width:  |  Height:  |  Size: 434 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 629 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 732 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 803 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 837 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 974 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 940 B

View File

@@ -22,8 +22,8 @@ import { _t } from 'matrix-react-sdk/src/languageHandler';
const VectorAuthFooter = () => {
const brandingConfig = SdkConfig.get().branding;
let links = [
{"text": "blog", "url": "https://blog.riot.im"},
{"text": "twitter", "url": "https://twitter.com/@RiotChat"},
{"text": "blog", "url": "https://element.io/blog"},
{"text": "twitter", "url": "https://twitter.com/element_hq"},
{"text": "github", "url": "https://github.com/vector-im/riot-web"},
];

View File

@@ -502,8 +502,8 @@ export default class ElectronPlatform extends VectorBasePlatform {
getSSOCallbackUrl(fragmentAfterLogin: string): URL {
const url = super.getSSOCallbackUrl(fragmentAfterLogin);
url.protocol = "riot";
url.searchParams.set("riot-desktop-ssoid", this.ssoID);
url.protocol = "element";
url.searchParams.set("element-desktop-ssoid", this.ssoID);
return url;
}

View File

@@ -7000,10 +7000,10 @@ matrix-mock-request@^1.2.3:
bluebird "^3.5.0"
expect "^1.20.2"
matrix-react-sdk@2.10.0:
version "2.10.0"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.10.0.tgz#41548173d46da0e746319256acdda117766cec6e"
integrity sha512-70wmkuXCkKQUJNDvoJ9EzdSeBtefOFDMr18r2SM5ujKGAIMiIxg/ZFm68oZ57b/eypj6pedTJN2dAcSznT/Tgw==
matrix-react-sdk@2.10.1:
version "2.10.1"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.10.1.tgz#e7307773702007a3b7145b2dbef6b7a9b84bafa8"
integrity sha512-5dauHbDk9fs6rYRt5L56Lr/o1qKLiL/ATySXk4RSoNUjq9v61bW8gIwQ3WgsCTzWd7U6NjzfdKPNnDEIdJID9g==
dependencies:
"@babel/runtime" "^7.8.3"
await-lock "^2.0.1"