Commit graph

2153 commits

Author SHA1 Message Date
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
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
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
Travis Ralston
5ea11e90b2 Appease the style linter 2020-08-25 21:17:35 -06:00
Travis Ralston
56c7f86983 Add an invite users to community step to dialog flow 2020-08-25 21:08:31 -06:00
Travis Ralston
7c1a9993e3 Add new create group dialog 2020-08-25 21:08:24 -06:00
Travis Ralston
84d782022f
Merge pull request #5139 from matrix-org/travis/communities/room-behaviour
Communities v2 prototype: Explore rooms, global state, and default room
2020-08-24 07:43:01 -06:00
Michael Telatynski
dc08fee635 Fix the resize handle being unreachable when you don't have permission to add widgets 2020-08-24 14:38:58 +01:00
Michael Telatynski
ef137d2234 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785 2020-08-24 11:13:04 +01:00
Travis Ralston
276ed90884 Add a personal group for an all-communities state
Design is approximate and needs review, though being completed out of band.
2020-08-21 18:19:29 -06:00
Michael Telatynski
35cc1fb06d small tweaks 2020-08-21 16:38:28 +01:00
Michael Telatynski
cca5ccd79d Switch widget resizing to re-resizable and add persistence 2020-08-21 16:29:07 +01:00
Travis Ralston
c815a370e7 Remove some unused components
We no longer have tinting support, so remove it. We still need the `Tinter` to exist though as it's used in quite a few places (though does nothing). Similarly, we have to keep the `roomColor` setting due to it being used in a few places - another PR can take away the tinter support properly.

The room tile context menu and top left menu are artifacts of the old room list.

The end to end tests weren't failing before as the code path is unused, however it seems worthwhile to keep it as we will eventually need it.
2020-08-20 20:47:02 -06:00
Michael Telatynski
ae65ed5c2e Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into resizable-appsdrawer
 Conflicts:
	res/css/views/rooms/_AppsDrawer.scss
2020-08-20 10:26:35 +01:00
Michael Telatynski
8cff59f123 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs 2020-08-18 17:36:04 +01:00
Michael Telatynski
24a390f840
Merge pull request #5123 from matrix-org/t3chguy/room-list/14466
Room List filtering visual tweaks
2020-08-18 17:22:05 +01:00
Bruno Windels
5c6a36f89a
Merge pull request #5072 from matrix-org/bwindels/make-reply-not-overlay
Make reply preview not an overlay so you can see new messages
2020-08-18 11:48:41 +00:00
Michael Telatynski
b6dd856649
Merge pull request #5118 from matrix-org/t3chguy/room-list/14617.2
Room List styling tweaks
2020-08-18 12:44:09 +01:00
Bruno Windels
5d98805d77 Merge branch 'develop' into bwindels/make-reply-not-overlay 2020-08-18 13:39:06 +02:00
Michael Telatynski
24a088e234 Iterate PR, tweak margins 2020-08-18 12:00:56 +01:00
Michael Telatynski
3fe6f0a792 delint css 2020-08-17 18:26:42 +01:00
Michael Telatynski
e20b375433 Add filter results count and explore prompt 2020-08-17 18:20:00 +01:00
Michael Telatynski
a4d11cc190 Change highlighting around the room list filter 2020-08-17 16:59:29 +01:00
Michael Telatynski
b9f22aa569 Merge branch 't3chguy/room-list/14617.2' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/14466 2020-08-17 15:32:45 +01:00
Michael Telatynski
6e2a26443d Fix corner rounding on images not always affecting right side 2020-08-17 10:55:54 +01:00
Michael Telatynski
21cdf5073c Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/14617 2020-08-14 18:58:26 +01:00
Michael Telatynski
4381bdfdbf fix typo 2020-08-14 18:53:56 +01:00
Michael Telatynski
90d99239bb Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/14617.2 2020-08-14 18:10:59 +01:00
Michael Telatynski
be1d390a93
Merge pull request #5106 from matrix-org/t3chguy/room-list/14608
Switch out the globe icon and colour it depending on theme
2020-08-14 18:10:29 +01:00
Michael Telatynski
d861536487 Make globe transparent 2020-08-14 10:30:54 +01:00
Michael Telatynski
4ec602b960 Make cutout in the decorated room avatar transparent rather than fixed 2020-08-14 10:20:59 +01:00
Michael Telatynski
a4847da0c2
Merge pull request #5107 from matrix-org/t3chguy/room-list/community-active-marker
Fix styling for selected community marker
2020-08-13 20:22:35 +01:00
J. Ryan Stinnett
3ece2dd21d Fix action bar safe area regression
The action bar was recently moved, but the safe area was not, which left a gap
between the event and the action bar, making it quite easy to trigger hover on a
different event instead of reaching the action bar.

Fixes https://github.com/vector-im/element-web/issues/14953
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/5056
2020-08-13 19:24:11 +01:00
Michael Telatynski
b8a260bb84 Change add room action for rooms to context menu 2020-08-13 16:18:26 +01:00
Michael Telatynski
4abbcd8c06 Fix styling for selected community marker 2020-08-13 15:24:21 +01:00