Commit graph

28495 commits

Author SHA1 Message Date
Michael Telatynski
39a59dbefa fix CI some more 2020-09-09 12:59:41 +01:00
Michael Telatynski
d9e17e89b5 fix CI 2020-09-09 12:55:16 +01:00
Michael Telatynski
8d66dce68d Update copy and use svg for ellipsis 2020-09-09 12:50:48 +01:00
Michael Telatynski
b635598bc3 Attempt to fix tests and fix RoomSummaryCard having wrong member count 2020-09-09 12:28:12 +01:00
Michael Telatynski
8dcb2d4719 attempt to fix CI tests 2020-09-09 12:06:16 +01:00
Michael Telatynski
bb98587143 fix e2e tests. Change the default Room Tab to RoomSummary 2020-09-09 11:42:41 +01:00
Michael Telatynski
37c0d524bc re-order top right buttons 2020-09-09 11:06:15 +01:00
Michael Telatynski
fb0b784369 test CI 2020-09-09 10:56:14 +01:00
Michael Telatynski
c8bc80a3b1 test with delay 2020-09-09 10:07:43 +01:00
Michael Telatynski
29c2a0ef35 Fix FilePanel and NotificationPanel overscroll issues 2020-09-09 09:50:08 +01:00
Michael Telatynski
644ff56ace Fix e2e tests 2020-09-09 09:38:13 +01:00
Nigel Mansell
421af52e76 Fixed 1px jump upwards on filter room members box
Signed-off-by: Nigel Mansell <mansell.nigel@mac.com>
2020-09-08 15:29:16 -04:00
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
b878c27741 Tidy devDeps, all the webpack stuff lives in the layer above 2020-09-08 16:56:22 +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