Michael Telatynski
517b594edc
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785.1
...
Conflicts:
src/components/structures/RightPanel.js
2020-09-08 18:04:24 +01:00
J. Ryan Stinnett
bbe2084f66
Add independent set up / reset actions in Settings
...
This adds set up and reset actions to each of cross-signing and secure backup
that do separate things, rather than mixing concerns together. (It's temporarily
still a bit of lie for backup, as more changes are needed to stop resetting
cross-signing as well.)
2020-09-08 18:01:56 +01:00
Michael Telatynski
12a6bc8231
update copy
2020-09-08 18:00:21 +01:00
Michael Telatynski
596060c506
fix alignments and iterate PR
2020-09-08 17:57:08 +01:00
Weblate
97199c4479
Merge branch 'origin/develop' into Weblate.
2020-09-08 16:46:07 +00:00
Michael Telatynski
83c2ae2479
Merge pull request #5180 from matrix-org/t3chguy/fix/15123
...
null-guard roomId in RightPanel and pass Room to UserView
2020-09-08 17:46:02 +01:00
Michael Telatynski
01a8ac25c9
Use null coalescing operator
2020-09-08 17:40:57 +01:00
Michael Telatynski
a17b2ba1e5
use constant
2020-09-08 17:38:13 +01:00
Michael Telatynski
27a65fff2b
null-guard roomId in RightPanel and pass Room to UserView
2020-09-08 17:34:32 +01:00
Weblate
e204914e31
Merge branch 'origin/develop' into Weblate.
2020-09-08 16:27:57 +00:00
TERMICO
093ed37c17
Translated using Weblate (Spanish)
...
Currently translated at 88.0% (2073 of 2356 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/es/
2020-09-08 16:27:56 +00:00
Michael Telatynski
15aafa019d
Merge pull request #5178 from matrix-org/t3chguy/crc.2
...
Fix create-react-class regression.
2020-09-08 17:27:51 +01:00
Michael Telatynski
8d03799ffe
Fix create-react-class regression.
...
Can't call setState in c'tor
2020-09-08 16:51:55 +01:00
Michael Telatynski
1532048f33
Fix behaviour WidgetStore for new/unknown rooms
2020-09-08 16:49:50 +01:00
Michael Telatynski
b982bf87b5
delint
2020-09-08 16:33:55 +01:00
Michael Telatynski
6c7cb473dc
finalise colours from Figma
2020-09-08 16:33:26 +01:00
Michael Telatynski
8d14d26e2b
do the todos
2020-09-08 16:27:09 +01:00
Michael Telatynski
4a4a8cd611
styling and fix i button behaviour
2020-09-08 15:43:40 +01:00
Michael Telatynski
3a99343433
iterate styling
2020-09-08 15:43:40 +01:00
Michael Telatynski
73dcba1425
i18n
2020-09-08 15:43:40 +01:00
Michael Telatynski
ef0843d4ad
Iterate to match design
2020-09-08 15:43:40 +01:00
Michael Telatynski
0fe6ce1842
Stage svgs
2020-09-08 15:43:40 +01:00
Michael Telatynski
98b59fb217
Consolidate all the work thus far
2020-09-08 15:43:38 +01:00
Michael Telatynski
31cca5e0f2
Create new right panel cards
2020-09-08 15:42:31 +01:00
Michael Telatynski
eb7f6f4c4b
Create new WidgetStore to track all widgets stuff
2020-09-08 15:42:31 +01:00
Michael Telatynski
89a836100d
small css tweaks to closer match the figma
2020-09-08 15:42:31 +01:00
Michael Telatynski
8f94a42daf
Update Right Panel phase recall behaviour
2020-09-08 15:42:31 +01:00
Michael Telatynski
2527344294
Create name/title Widget utils
2020-09-08 15:42:31 +01:00
Michael Telatynski
11e349d6c8
Update e2e iconography
2020-09-08 15:42:31 +01:00
J. Ryan Stinnett
aae68f7d1a
Move 4S status to backup panel
...
This moves the various 4S status diagnostics to the backup panel and out of the
cross-signing panel. The available actions are unchanged as part of this commit,
but they will be updated next.
2020-09-08 15:26:59 +01:00
J. Ryan Stinnett
2fbb551035
Put backup details in a table
2020-09-08 15:26:59 +01:00
Weblate
d3f504aa3e
Merge branch 'origin/develop' into Weblate.
2020-09-08 14:24:14 +00:00
Michael Telatynski
87b72de25f
Merge pull request #5176 from matrix-org/t3chguy/dpsah/6785.4
...
Fix WatchManager for global room watchers and tidy widget code a little
2020-09-08 15:24:10 +01:00
Weblate
042bff9d08
Merge branch 'origin/develop' into Weblate.
2020-09-08 14:23:42 +00:00
Michael Telatynski
a80bcaa292
Merge pull request #5174 from matrix-org/t3chguy/fix/15100
...
Fix permalink local linkification to not strip via servers
2020-09-08 15:23:38 +01:00
Michael Telatynski
9d85d0436c
iterate PR
2020-09-08 15:22:23 +01:00
Weblate
9c9d375d31
Merge branch 'origin/develop' into Weblate.
2020-09-08 14:16:55 +00:00
Jason Robinson
75518254fb
Merge pull request #5173 from matrix-org/jaywink/jitsi-openidjwt-auth
...
Support creation of Jitsi widgets with "openidtoken-jwt" auth
2020-09-08 17:16:50 +03:00
Michael Telatynski
1b99c11b11
tidy
2020-09-08 15:09:45 +01:00
Michael Telatynski
5c3c8cfb06
Make Travis an ounce happier
2020-09-08 15:07:16 +01:00
Weblate
66b42c6860
Merge branch 'origin/develop' into Weblate.
2020-09-08 14:03:10 +00:00
Michael Telatynski
73b8493fe8
Merge pull request #5177 from matrix-org/t3chguy/fix/15115
...
Fix create-react-class regression.
2020-09-08 15:03:03 +01:00
Weblate
63abeefc54
Merge branch 'origin/develop' into Weblate.
2020-09-08 13:20:42 +00:00
LinAGKar
abaf470261
Translated using Weblate (Swedish)
...
Currently translated at 100.0% (2356 of 2356 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sv/
2020-09-08 13:20:41 +00:00
Travis Ralston
5c878ddfdd
Merge pull request #5172 from matrix-org/travis/widgets/msc1960-1
...
Update openid_credentials Widget API action for MSC1960 updates
2020-09-08 07:20:35 -06:00
Michael Telatynski
99cd2dceec
Fix create-react-class regression.
...
Can't call setState in c'tor
2020-09-08 12:07:24 +01:00
Michael Telatynski
48d9c94c88
Extract editWidget into WidgetUtils
2020-09-08 11:12:14 +01:00
Michael Telatynski
3bc42d7470
delint
2020-09-08 11:05:33 +01:00
Michael Telatynski
b75e2aa299
WidgetEchoStore improve update event to include roomId and widgetId
2020-09-08 11:01:55 +01:00
Michael Telatynski
07f7ff6831
Fix WatchManager global room watchers
2020-09-08 11:01:36 +01:00
