Commit graph

2376 commits

Author SHA1 Message Date
Travis Ralston
1ffc6d5bd3 Make the hangup button do things for conference calls
Behaviour constraints:
* If you're not in the conference, use a grey button that does nothing.
* If you're in the conference, show a button:
  * If you're able to modify widgets in the room, annotate it in the context of ending the call for everyone and remove the widget. Use a confirmation dialog.
  * If you're not able to modify widgets in the room, hang up.

For this we know that persistent Jitsi widgets will mean that the user is in the call, so we use that to determine if they are actually participating.
2020-09-16 14:35:55 -06:00
Travis Ralston
b177843e45 Remove defunct "always show encryption icons" setting
It doesn't do anything in practice.

Fixes https://github.com/vector-im/element-web/issues/8725
2020-09-14 22:03:54 -06:00
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
J. Ryan Stinnett
d53cbecbb1
Merge pull request #5198 from matrix-org/jryans/userinfo-scroll
Fix user info scrolling in new card view
2020-09-11 14:52:06 +01:00
J. Ryan Stinnett
e49a657a90 Fix user info scrolling in new card view
Fixes https://github.com/vector-im/element-web/issues/15148
2020-09-11 11:39:58 +01:00
J. Ryan Stinnett
cd3aa81eed Fix sticker picker height
Fixes https://github.com/vector-im/element-web/issues/15152
2020-09-11 11:12:56 +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
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
Michael Telatynski
050319c0cc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into fix-1px-jump 2020-09-09 17:37:50 +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
Michael Telatynski
cef533b83e Update ellipsis svg 2020-09-09 13:09:21 +01:00
Michael Telatynski
8d66dce68d Update copy and use svg for ellipsis 2020-09-09 12:50:48 +01:00
Michael Telatynski
c8bc80a3b1 test with delay 2020-09-09 10:07:43 +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
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
596060c506 fix alignments and iterate PR 2020-09-08 17:57:08 +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
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
89a836100d small css tweaks to closer match the figma 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
2fbb551035 Put backup details in a table 2020-09-08 15:26:59 +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
Nigel Mansell
590e2b70f9 Merge remote-tracking branch 'upstream/develop' into develop 2020-09-05 16:51:13 -04:00
J. Ryan Stinnett
cc2c179a0f Set default text colour for Settings tabs 2020-09-04 13:56:28 +01:00
J. Ryan Stinnett
e3f47525e5 Rename backup CSS classes 2020-09-04 13:56:28 +01:00
J. Ryan Stinnett
46bc6b1d14 Rename key backup to secure backup 2020-09-04 13:56:28 +01:00
J. Ryan Stinnett
da6cc5c2e9 Tweak Security settings section headers
This brings us slightly closer to the version Design is working from in terms of
section naming.

Prep for https://github.com/vector-im/element-web/issues/13895
2020-09-03 15:41:17 +01:00
Michael Telatynski
243af3c9f2 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785 2020-09-02 09:27:06 +01:00
Nigel Mansell
7550a92df9 Fixed 1px jump upwards on filter room members box
Signed-off-by: Nigel Mansell <mansell.nigel@mac.com>
2020-09-01 13:58:48 -04:00
Travis Ralston
78d5b87fbc Use a different border variable for compatibility with custom themes 2020-08-31 11:20:28 -06:00
Travis Ralston
fdbaddbace Add a simple edit dialog for communities 2020-08-31 10:52:08 -06:00
Travis Ralston
02095389e7 Add structure for mixed prototype UserMenu 2020-08-28 17:03:17 -06:00
Travis Ralston
01b0acbe62 Make the UserMenu echo the current community name 2020-08-28 16:14:08 -06:00
Travis Ralston
0ffa548864 Change the menu button to a chevron
by design request
2020-08-28 15:37:23 -06:00
Travis Ralston
e58b514803 Add clarifying text to DM dialog about what is about to happen 2020-08-28 13:22:20 -06:00
Travis Ralston
cc2fc911af Minor copy addition to DM dialog for communities prototype 2020-08-28 10:03:27 -06:00
Travis Ralston
52e095fa61
Merge pull request #5151 from matrix-org/travis/copy-change
Update create room dialog copy & community prototype home icon
2020-08-28 09:47:53 -06:00
Travis Ralston
3c176f762e Remove disabled clear button from tag panel + dead code 2020-08-27 14:27:06 -06:00
Travis Ralston
13e9f7b912 Update home icon 2020-08-27 13:18:52 -06:00
Michael Telatynski
bf3c49b8df Remove redundant CSS rules 2020-08-27 10:46:29 +01:00
Travis Ralston
b294ec6427
Merge pull request #5145 from matrix-org/travis/communities/proto/switcher
Communities v2 prototype: Tag panel selection changes
2020-08-26 10:22:50 -06:00
Travis Ralston
82b015bd5f Rename components to match prior convention 2020-08-26 08:52:39 -06:00
Travis Ralston
0c67a42b0f Make padding only on the prototype tag panel 2020-08-26 08:42:26 -06:00
Travis Ralston
20c562c208 Change user avatar to a home icon 2020-08-25 21:46:26 -06:00