Travis Ralston
77f8c48dc4
Merge pull request #5195 from matrix-org/travis/iconography-update
...
Show verification status in the room summary card
2020-09-11 09:12:46 -06:00
Travis Ralston
8862b8298c
Use hooks better
2020-09-11 09:04:06 -06:00
David Baker
07693b71b1
Merge pull request #5194 from matrix-org/dbkr/dont_unpin_persistent_widgets
...
Don't show 'unpin' for persistent widgets
2020-09-11 09:53:09 +01:00
J. Ryan Stinnett
e7e6bc93ec
Merge pull request #5182 from matrix-org/jryans/defer-cross-signing-setup
...
Split up cross-signing and secure backup settings
2020-09-11 09:41:40 +01:00
Michael Telatynski
247e1d431d
Merge pull request #5185 from matrix-org/t3chguy/fix/3543
...
Fix onNewScreen to use replace when going from roomId->roomAlias
2020-09-11 07:29:10 +01:00
Travis Ralston
4cb7381d03
Show verification status in the room summary card
...
Fixes https://github.com/vector-im/element-web/issues/15143
Colours are the same for both light and dark theme.
2020-09-10 13:53:42 -06:00
David Baker
b7058a33ad
lint
2020-09-10 14:37:44 +01:00
David Baker
eeb4c5696f
Don't show 'unpin' for persistent widgets
...
This will mostly fix https://github.com/vector-im/element-web/issues/15139
although it could still break in a race condition.
2020-09-10 14:30:35 +01:00
Matthew Hodgson
89d05ac952
bring back 1.2M style badge counts rather than 99+
2020-09-10 13:51:34 +01:00
Travis Ralston
a765db8977
Merge pull request #5189 from matrix-org/travis/rageshake-fix
...
Run the rageshake command through the bug report dialog
2020-09-09 15:08:43 -06:00
Travis Ralston
9b5823cccb
Run the rageshake command through the bug report dialog
...
Ideally we encourage users to give us information like a github issue or options to download their logs.
2020-09-09 14:53:38 -06:00
Travis Ralston
0a7090dd64
Account for via in pill matching regex
...
Fixes https://github.com/vector-im/element-web/issues/15133
Regression first appeared in a80bcaa292
This also affects room IDs.
2020-09-09 14:36:35 -06:00
Michael Telatynski
c26f3b8a97
Fix onNewScreen to use replace when going from roomId->roomAlias to prevent locking the user in place
2020-09-09 16:52:46 +01:00
David Baker
62556c2afe
Merge pull request #5184 from matrix-org/dbkr/always_allow_local_widgets
...
Always allow widgets when using the local version
2020-09-09 15:52:31 +01:00
David Baker
f9079975a1
write correct jsdoc
2020-09-09 15:42:25 +01:00
David Baker
99b0a0a78e
Always allow widgets when using the local version
...
Since we're not loading the widget URL, there's no need to ask
for permission to load it: it's just another part of the app.
2020-09-09 15:35:05 +01:00
Michael Telatynski
a1f1334250
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785.3
...
Conflicts:
src/components/structures/RoomView.tsx
2020-09-09 15:16:19 +01:00
J. Ryan Stinnett
0219824d6f
Merge remote-tracking branch 'origin/develop' into jryans/defer-cross-signing-setup
2020-09-09 14:13:23 +01:00
J. Ryan Stinnett
6d1b1d9460
Fix linting error
2020-09-09 14:12:36 +01:00
Michael Telatynski
0e58eb6d56
Update initial widget height
2020-09-09 13:15:07 +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
37c0d524bc
re-order top right buttons
2020-09-09 11:06:15 +01:00
Michael Telatynski
29c2a0ef35
Fix FilePanel and NotificationPanel overscroll issues
2020-09-09 09:50:08 +01: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
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
27a65fff2b
null-guard roomId in RightPanel and pass Room to UserView
2020-09-08 17:34:32 +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
b982bf87b5
delint
2020-09-08 16:33:55 +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
ef0843d4ad
Iterate to match design
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
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
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
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
Michael Telatynski
9d85d0436c
iterate PR
2020-09-08 15:22:23 +01: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
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
906d4defd5
Convert RoomView and RoomContext to TS
2020-09-08 10:52:37 +01:00
Michael Telatynski
6a304ce16e
Remove ancient RoomView props.eventPixelOffset
2020-09-08 10:52:27 +01:00
Michael Telatynski
667c129ebc
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785
...
Conflicts:
src/components/structures/ScrollPanel.js
src/components/views/rooms/AppsDrawer.js
2020-09-07 14:33:57 +01:00