Commit graph

12 commits

Author SHA1 Message Date
Michael Telatynski
cbcac9dd49 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs
 Conflicts:
	package.json
2020-08-03 12:54:06 +01:00
Travis Ralston
9c8682428f Fix various TypeScript linting issues 2020-07-29 11:03:43 -06:00
Michael Telatynski
a0e7efd7d5 delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-21 22:50:39 +01:00
Michael Telatynski
fd869b20fa type coerce
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-21 22:33:01 +01:00
Michael Telatynski
c4fc70b9be Post-merge fix
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-21 22:28:36 +01:00
Michael Telatynski
70c81cc377 Merge branches 'develop' and 'travis/download-logs' of github.com:matrix-org/matrix-react-sdk into travis/download-logs
 Conflicts:
	src/i18n/strings/en_EN.json
	src/rageshake/submit-rageshake.ts
2020-07-21 22:22:28 +01:00
Michael Telatynski
6fe5196a19 send state of lowBandwidth in rageshakes
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-08 11:43:50 +01:00
David Baker
4bf2e5fd8e Remove SSSS key upgrade check from rageshake
This code doesn't exist anymore as the SSSS symmetric upgrade stuff
has been removed.

Fixes https://github.com/vector-im/riot-web/issues/13715
2020-05-19 15:40:26 +01:00
Michael Telatynski
03ad8a606a
Merge branch 'develop' into t3chguy/rageshake_xsign_debug 2020-05-12 09:44:49 +01:00
David Baker
f487c2b38c Fix rageshake with no matrix client
We checked for the presence of a matrix client but then went and
called a method on it assuming it existed on the line below, so,
don't do that.

https://github.com/vector-im/riot-web/issues/13624 pointed this out
2020-05-11 16:21:08 +01:00
Michael Telatynski
3e934c8081 Send cross-signing debug booleans over rageshake
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-11 15:17:25 +01:00
Michael Telatynski
3bc5a0a0b2 Convert submit-rageshake to typescript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-19 12:06:56 +01:00
Renamed from src/rageshake/submit-rageshake.js (Browse further)