Commit graph

28801 commits

Author SHA1 Message Date
J. Ryan Stinnett
26e63c23b6
Merge pull request #5307 from matrix-org/jryans/sso-4s-integration
Convert `src/SecurityManager.js` to TypeScript
2020-10-12 11:41:12 +01:00
J. Ryan Stinnett
6498f3fcef Simplify types 2020-10-12 11:11:39 +01:00
J. Ryan Stinnett
2698a12a6f Convert src/SecurityManager.js to TypeScript
This includes a few small API tweaks as well, only in cases where TS revealed we
were doing something confusing or wrong.

Part of https://github.com/vector-im/element-web/issues/15350
2020-10-09 17:27:03 +01:00
Travis Ralston
0c6ac113f4
Merge pull request #5305 from matrix-org/travis/widgets/broken-jitsi
Fix templating for v1 jitsi widgets
2020-10-09 09:32:42 -06:00
Travis Ralston
1af8d96db9 Fix templating for v1 jitsi widgets
Fixes https://github.com/vector-im/element-web/issues/15427
2020-10-09 09:26:52 -06:00
Travis Ralston
e92af6cb73
Merge pull request #5303 from matrix-org/travis/fix-widget-comms
Use new preparing event for widget communications
2020-10-08 21:21:31 -06:00
Travis Ralston
25db3e9efa Update widget-api 2020-10-08 21:21:11 -06:00
Travis Ralston
d38b544a42 Use new preparing event for widget communications
Fixes https://github.com/vector-im/element-web/issues/15404

We need to make sure we don't accidentally call the widget before its ready, but we can happily show it once it is loaded/prepared.
2020-10-08 15:35:22 -06:00
Travis Ralston
bce0204eb6
Merge pull request #5302 from matrix-org/travis/fix-preview
Fix parsing issue in event tile preview for appearance tab
2020-10-08 15:03:43 -06:00
Travis Ralston
2cd431db1c Appease the linter 2020-10-08 14:50:17 -06:00
Travis Ralston
d5b264b7a0 Fix parsing issue in event tile preview for appearance tab
Fixes https://github.com/vector-im/element-web/issues/15419
2020-10-08 14:21:39 -06:00
Michael Telatynski
177b76d882
Merge pull request #5284 from matrix-org/t3chguy/fix/10353
Track replyToEvent along with Cider state & history
2020-10-08 14:59:14 +01:00
Michael Telatynski
513eb034cc
Merge pull request #5299 from matrix-org/t3chguy/fix/15408
Roving Tab Index should not interfere with inputs
2020-10-08 14:50:48 +01:00
Michael Telatynski
841abc21e1 Roving Tab Index should not interfere with inputs
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-08 10:25:03 +01:00
J. Ryan Stinnett
0466f1df76
Merge pull request #5298 from matrix-org/jryans/2020-10-polishing
Visual tweaks from 2020-10-06 polishing
2020-10-08 10:15:04 +01:00
Michael Telatynski
b2d04deb83 fix tests for the new sessionStorage key
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-08 10:04:01 +01:00
J. Ryan Stinnett
576ea6df08 Use same colour variable as text 2020-10-08 10:01:05 +01:00
J. Ryan Stinnett
73ce2fac8a Add comment on colour 2020-10-08 09:56:58 +01:00
Michael Telatynski
017d2d40fe Update CIDER local and session storage keys to unbrick downgrade compat
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-08 09:51:31 +01:00
J. Ryan Stinnett
43ea5de320 Adjust Settings styles 2020-10-07 20:23:34 +01:00
J. Ryan Stinnett
3d0db1b022 Change invite icon 2020-10-07 20:08:59 +01:00
J. Ryan Stinnett
936344b012 Make back button a circle 2020-10-07 17:53:41 +01:00
J. Ryan Stinnett
5a4ca4578a Sprinkle some ts-ignore lines 2020-10-07 17:18:19 +01:00
J. Ryan Stinnett
f77dace173 Shake lock file to attempt fixing CI 2020-10-07 17:07:44 +01:00
J. Ryan Stinnett
779e43b8dd
Merge pull request #5296 from matrix-org/jryans/sso-4s-integration
Convert auth lifecycle to TS, remove dead ILAG code
2020-10-07 15:42:42 +01:00
J. Ryan Stinnett
28e458075a Fix types after underscore changes 2020-10-07 15:10:11 +01:00
J. Ryan Stinnett
0b443c5280
Merge pull request #5297 from RiotTranslateBot/weblate-element-web-matrix-react-sdk
Update from Weblate
2020-10-07 13:38:51 +01:00
J. Ryan Stinnett
72bd72e524 Remove underscores 2020-10-07 13:32:30 +01:00
Weblate
4965886498 Merge branch 'origin/develop' into Weblate. 2020-10-07 12:16:50 +00:00
Michael Telatynski
7205e5d2e5
Merge pull request #5295 from matrix-org/t3chguy/fix/15403
Fix edited replies being wrongly treated as big emoji
2020-10-07 13:16:46 +01:00
J. Ryan Stinnett
40292884bf Regenerate component CSS index 2020-10-07 13:09:03 +01:00
J. Ryan Stinnett
4dd6e96bfd Regenerate strings 2020-10-07 13:00:27 +01:00
J. Ryan Stinnett
a762317a3e Regenerate lint ignore file 2020-10-07 12:56:12 +01:00
J. Ryan Stinnett
f2b72efe39 Remove various remaining bits of ILAG flows
TypeScript helpfully pointed me towards this dead code, which has been floating
around unused for a while. If we want to bring back ILAG in the future, we can
always revive it from history.
2020-10-07 12:53:59 +01:00
J. Ryan Stinnett
1b255e42c3 Convert src/Lifecycle.ts to TypeScript 2020-10-07 12:53:59 +01:00
J. Ryan Stinnett
11eb9b59e6 Convert src/Login.js to TypeScript 2020-10-07 11:47:27 +01:00
Weblate
e172f71f29 Merge branch 'origin/develop' into Weblate. 2020-10-07 10:08:51 +00:00
LinAGKar
70632e8153 Translated using Weblate (Swedish)
Currently translated at 100.0% (2374 of 2374 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sv/
2020-10-07 10:08:51 +00:00
Szimszon
b37f6db909 Translated using Weblate (Hungarian)
Currently translated at 100.0% (2374 of 2374 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/hu/
2020-10-07 10:08:50 +00:00
Xose M
8004b21e5e Translated using Weblate (Galician)
Currently translated at 99.9% (2373 of 2374 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/gl/
2020-10-07 10:08:49 +00:00
Jeff Huang
88824c02d3 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2374 of 2374 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/zh_Hant/
2020-10-07 10:08:49 +00:00
Michael Telatynski
709d33c21c
Merge pull request #5294 from matrix-org/t3chguy/fix/w2
Fix StopGapWidget infinitely recursing
2020-10-07 11:08:44 +01:00
Michael Telatynski
8a226781c4 Fix edited replies being wrongly treated as big emoji
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-07 11:08:43 +01:00
Michael Telatynski
0e42fc45e2 Resolve couple of React warnings/errors
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-07 10:40:20 +01:00
Michael Telatynski
67193b0ea7 Fix StopGapWidget infinitely recursing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-07 10:39:52 +01:00
Michael Telatynski
0d6edab708 Workaround Jest bug with ArrayBuffers
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-07 01:22:29 +01:00
Weblate
3304dff984 Merge branch 'origin/develop' into Weblate. 2020-10-06 23:15:01 +00:00
Michael Telatynski
430bceb91d
Merge pull request #5281 from matrix-org/t3chguy/fix/9836
Fix editing and redactions not updating the Reply Thread
2020-10-07 00:14:56 +01:00
Michael Telatynski
a8d88e01fb Write Enzyme tests for SendMessageComposer state/history persistence behaviour
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-07 00:10:40 +01:00
Michael Telatynski
965debf442 extend mockClient in testutils
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-07 00:09:48 +01:00