OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
34,942 Commits
217 Branches
562 Tags
492 MiB
Commit Graph

2520 Commits (eefadf6a4653d0acbe9858a8960b64d2e52ac196)

Author SHA1 Message Date
Michael Telatynski 7d90612371 Iterate PR 2021-06-17 16:22:40 +01:00
Šimon Brandner d89392a1d9
Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip 2021-06-17 15:41:19 +02:00
Šimon Brandner dbdb61c820
Improve the mxid overlap situation 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-16 17:21:29 +02:00
Michael Telatynski 384bb3af2e Fix layout regression in the invite dialog for few results 2021-06-16 10:37:34 +01:00
Michael Telatynski b4fbc791bb Add experimental options to the Spaces beta 2021-06-16 09:01:13 +01:00
Šimon Brandner 5dc87869eb
Also override mx_SenderProfile_mxid 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-15 17:22:47 +02:00
Tulir Asokan cdd2773aa6 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-06-15 17:37:49 +03:00
Michael Telatynski a52dd57eb2 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17529 
 Conflicts:
	package.json
	yarn.lock
 2021-06-15 13:59:54 +01:00
Michael Telatynski 660a849cdd Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash 
 Conflicts:
	package.json
	src/ContentMessages.tsx
	yarn.lock
 2021-06-15 12:58:29 +01:00
Michael Telatynski 83c30b2280 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244 
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
 2021-06-15 12:24:26 +01:00
Šimon Brandner d08495bde6
Fix display name overlap 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-15 06:30:22 +02:00
Michael Telatynski 539465ecb4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 
 Conflicts:
	src/components/views/dialogs/InviteDialog.tsx
 2021-06-14 22:22:30 +01:00
Michael Telatynski 91df392a2a
Merge pull request #5880 from SimonBrandner/show-username 2021-06-14 21:34:01 +01:00
Šimon Brandner 5343be7814
Fix buggy hovering/selecting of event tiles 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-10 18:53:56 +02:00
Šimon Brandner 8174973cfe
Use the same styling as for mx_TextualEvent 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-10 15:31:27 +02:00
Germain Souquet 15132074e2 Restore copy button icon when sharing permalink 2021-06-09 13:44:31 +01:00
Šimon Brandner fccd71f82e
Update styling based on review 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-09 06:23:51 +02:00
Michael Telatynski f34a2e61bc Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 2021-06-08 16:54:49 +01:00
Michael Telatynski 34cc494a8e
Merge pull request #6140 from matrix-org/t3chguy/fix/17553 2021-06-08 16:45:35 +01:00
Michael Telatynski 90bb7c1482 Switch Space Settings for a tabbed view with a bunch more settings exposed 2021-06-08 16:33:47 +01:00
Šimon Brandner bf77a4a2ab
Merge remote-tracking branch 'upstream/develop' into show-username 2021-06-08 17:14:42 +02:00
Robin Townsend 372f24ff99 Hide download links from forward dialog preview 
since trying to interact with them is pointless.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-07 19:19:14 -04:00
Robin Townsend b97867271b Merge branch 'develop' into improved-forwarding-ui 2021-06-07 19:09:36 -04:00
Šimon Brandner 025148d9fc
Merge branch 'develop' into show-username 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-07 19:37:22 +02:00
Tulir Asokan 059241b5cc Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-06-07 19:26:12 +03:00
Michael Telatynski 6d2a7390d7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244 2021-06-07 14:15:49 +01:00
Michael Telatynski bd8fd77d54
Merge pull request #6148 from robintown/fix-timestamps 2021-06-07 13:12:11 +01:00
Michael Telatynski 8c34a8461e Add way to specify address during public space creation 2021-06-07 08:57:39 +01:00
Robin Townsend ea2120bdfd Fix timestamps 
7f83590846 changed timestamps to be hidden
at the DOM level, not the CSS level. We can keep that approach, we just
need to ensure they still get shown at the right times.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-06 01:55:01 -04:00
Robin Townsend e891d18fa2 Add my email to my copyright notices 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-05 21:41:28 -04:00
Robin Townsend 17edfec3aa Make it easier to pan images in the lightbox 
Previously, if you were dragging an image and your cursor outpaced the
edge of the image as it was moving, panning would abruptly stop. This
moves a few of the lightbox event listeners one level up to the image
wrapper to ensure that all drag movements are detected, even if they
don't end over the image's current position.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-05 21:08:44 -04:00
Robin Townsend a06306d560 Merge branch 'develop' into improved-forwarding-ui 2021-06-05 11:04:17 -04:00
Michael Telatynski 93f41ce0ab Actually finish the empty state for the pinned messages card 2021-06-04 11:35:17 +01:00
Šimon Brandner 629201a074
Merge branch 'develop' into fix/mute-incoming-call/15591 2021-06-04 07:59:28 +02:00
Michael Telatynski 93010d34fd
Merge branch 'develop' into t3chguy/fix/6606 2021-06-03 19:33:09 +01:00
Michael Telatynski 0c97d90fb9 Iterate PR based on feedback 2021-06-03 16:44:28 +01:00
Germain a36063704d
Merge pull request #6138 from matrix-org/gsouquet/containment-event 
Fix mx_Event containment rules and empty read avatar row
 2021-06-03 16:38:55 +01:00
Germain Souquet 5ef78f43a4 fix containment rule to keep height when resizing vertically 2021-06-03 16:26:20 +01:00
Michael Telatynski f2643151c6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 
 Conflicts:
	src/components/views/dialogs/InviteDialog.tsx
 2021-06-03 16:22:59 +01:00
Germain 7f83590846
Merge pull request #6079 from matrix-org/gsouquet/switch-rooms 2021-06-03 08:44:01 +01:00
Michael Telatynski 4f50727010 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606 
 Conflicts:
	src/components/structures/RoomView.tsx
	src/components/views/right_panel/UserInfo.tsx
 2021-06-03 08:42:05 +01:00
Germain 430cfa9c06
Merge pull request #6127 from matrix-org/gsouquet/css-containment 
Add CSS containment rules for shorter reflow operations
 2021-06-03 08:10:29 +01:00
Germain Souquet bc50028f70 Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash 2021-06-02 13:57:33 +01:00
Germain 9d126c51e4
Merge pull request #6113 from matrix-org/gsouquet/improve-layout-rendering 2021-06-02 11:41:59 +01:00
J. Ryan Stinnett 2d50325836
Merge pull request #6133 from matrix-org/jryans/event-tile-radius 
Tweak event border radius to match action bar
 2021-06-02 11:39:54 +01:00
Michael Telatynski bc3c759feb Add temporary mechanism for managing communities without dnd 2021-06-02 11:33:25 +01:00
J. Ryan Stinnett 234c65b331 Tweak event border radius to match action bar 
This adjusts the `border-radius` used when hovering on an event to match the
recently changed value for the action bar (changed to `8px` in
https://github.com/matrix-org/matrix-react-sdk/pull/6066).
 2021-06-02 10:25:29 +01:00
Robin Townsend 8efbdd0406 Match forward dialog send failed indicator color with button 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-01 17:56:46 -04:00
Robin Townsend 56714525f2 Merge branch 'develop' into improved-forwarding-ui 2021-06-01 17:28:55 -04:00
Germain Souquet ebd7cd6212 Add CSS containement rules for shorter reflow operations 2021-06-01 11:26:32 +01:00
Germain Souquet d894cc6f7a Merge branch 'develop' into gsouquet/switch-rooms 2021-06-01 09:02:28 +01:00
Germain Souquet 18188538f6 Move the read receipt animation to the compositing layer 2021-05-28 14:59:54 +01:00
Michael Telatynski caaef63077 delint1 2021-05-28 13:11:48 +01:00
Michael Telatynski 36e43270ca
Apply suggestions from code review 2021-05-28 13:08:05 +01:00
Michael Telatynski e41645795c Merge branch 't3chguy/fix/17365' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 2021-05-28 13:05:41 +01:00
Nique Woodhouse ea26393709 Styling amends to accommodate the invite dialog footer 2021-05-28 13:00:18 +01:00
Michael Telatynski 2c750fcb7a Fix overflow issue in suggestion tiles 2021-05-28 12:48:12 +01:00
Germain Souquet 1a51ed9ffd Make breadcrumb animation run on the compositing layer 2021-05-28 09:34:08 +01:00
Michael Telatynski f75fb3b349 Add footer and privacy note to the start dm dialog 2021-05-27 15:51:25 +01:00
Germain Souquet aaca71b316 Reintroduce sticky header width 2021-05-27 12:44:53 +01:00
Michael Telatynski 54d8953024 delint 2021-05-26 14:00:53 +01:00
Michael Telatynski 27ad90760d Iterate pinned messages 2021-05-26 13:51:17 +01:00
Germain Souquet c7c6a818f0 Merge branch 'develop' into gsouquet/switch-rooms 2021-05-26 09:51:27 +01:00
Michael Telatynski 59f4c728c9 Initial cut of Pinned event card in the right panel 2021-05-25 16:10:44 +01:00
Germain Souquet 36dddea338 remove CSS out of sync comment 2021-05-25 14:57:07 +01:00
Germain Souquet 7303166924 fix sticky headers when results num get displayed 2021-05-25 13:53:20 +01:00
Michael Telatynski 13427aaf07 Add a pulse animation to the pinned messages indicator and move it 2021-05-25 13:07:39 +01:00
Robin Townsend 400917623c Make myself the copyright holder for forward dialog code 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-24 08:33:28 -04:00
Nique Woodhouse 153d0ae66d
Merge pull request #6066 from matrix-org/niquewoodhouse-message-action-bar-refine-ui 
Improve styling of the message action bar
 2021-05-24 13:30:27 +01:00
Germain Souquet ecff5bd65c Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash 2021-05-24 09:20:12 +01:00
Šimon Brandner c678211a42
Add styling for silencing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-22 20:24:20 +02:00
Michael Telatynski 3f9b6caacd fix missing rounded corners on blurhash placeholder 2021-05-21 21:46:18 +01:00
Robin Townsend 7a04502151 Iterate on forward dialog design feedback 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-21 12:41:29 -04:00
Robin Townsend f34d61cf5d Merge branch 'develop' into improved-forwarding-ui 2021-05-21 08:15:09 -04:00
Travis Ralston 767c7a1e38
Merge pull request #5680 from robintown/better-spinners 
Vectorize spinners
 2021-05-20 13:31:35 -06:00
Germain Souquet f058fd8869 Reduce amount of DOM nodes 2021-05-20 15:39:25 +01:00
Germain Souquet d362321706 Simplify SenderProfile DOM structure 2021-05-20 15:25:20 +01:00
Robin Townsend 6cb6c7f3d0 Combine forward dialog room and DM lists 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-19 13:33:48 -04:00
Robin Townsend 83224dc7b6 Ensure forward list room decorations are aligned 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-19 13:32:27 -04:00
Robin Townsend 678b298bab Merge branch 'develop' into improved-forwarding-ui 2021-05-19 12:39:48 -04:00
Michael Telatynski abd290938a Fix room name not wrapping in summary card 2021-05-19 17:12:25 +01:00
Nique Woodhouse 8d072cedff Update _MessageActionBar.scss 
Correct error on css hover for message action button background colour change
 2021-05-19 12:11:24 +01:00
Nique Woodhouse 5daca41bfb Update _MessageActionBar.scss 
Increase size of buttons
 2021-05-19 11:17:34 +01:00
Nique Woodhouse 8a3db3b40a Update _MessageActionBar.scss 
Refine UI of message action bar to increase usability and focus on bar content.
 2021-05-19 10:25:54 +01:00
Michael Telatynski f0a0d7f998 Fix add reactions prompt button jumping timeline if font set lower than default 2021-05-17 10:01:24 +01:00
Robin Townsend e798b36f1d Decorate forward dialog room avatars 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-16 08:39:22 -04:00
Robin Townsend 64e828d069 Merge branch 'develop' into improved-forwarding-ui 2021-05-16 08:13:59 -04:00
Robin Townsend 555b2e3266 Reuse Spinner styles for InlineSpinner 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-16 08:00:54 -04:00
Robin Townsend 74cc00b319 Merge branch 'develop' into better-spinners 2021-05-16 07:47:34 -04:00
Michael Telatynski c7c61bf26a
Merge pull request #6030 from matrix-org/t3chguy/fix/17276 
Decorate room avatars with publicity in add existing to space flow
 2021-05-14 11:23:46 +01:00
Michael Telatynski 4f55ac1fa6
Merge pull request #6025 from matrix-org/t3chguy/fix/16674 
Improve Spaces "Just Me" wizard
 2021-05-14 10:58:55 +01:00
Michael Telatynski bdeb4b3bae
Merge pull request #6037 from matrix-org/niquewoodhouse-room-sublist-button-feedback 
Increase hover feedback on room sub list buttons
 2021-05-14 10:55:32 +01:00
Nique Woodhouse 486350cba2 Update _RoomSublist.scss 2021-05-14 10:41:32 +01:00
Nique Woodhouse 6acf2543f0 Update _RoomSublist.scss 
Fix indentation and remove random spurious blank line
 2021-05-14 10:38:37 +01:00
Nique Woodhouse b71bc88514 Update _RoomSublist.scss 
Alter border radius of RoomSublist buttons to reflect shape of other buttons in room list.

Add background color on hover to RoomSublist buttons to provide more visual feedback.
 2021-05-14 09:22:40 +01:00
Michael Telatynski 5feb9e85d7
Merge branch 'develop' into t3chguy/fix/16622 2021-05-13 16:12:42 +01:00
Michael Telatynski 6aa477f0f5 Decorate room avatars with publicity in add existing to space flow 2021-05-13 14:23:28 +01:00
Michael Telatynski 76afc1100a Convert to Typescript and move from ClientPeg to Context 2021-05-13 14:13:00 +01:00
Michael Telatynski 87ae47bd61 tweak reactions row some more, third try lucky 2021-05-13 13:59:10 +01:00
Michael Telatynski 36633ec025 Tweak alignment of reactions row, move add reaction to right and only show on hover 2021-05-13 13:32:38 +01:00
Michael Telatynski b5fa4d88bf Add extra add reactions button to encourage more diverse reactions to content 2021-05-13 10:56:51 +01:00
Michael Telatynski 3af0138e9d Update emoji icons to new style 2021-05-13 10:28:35 +01:00
Michael Telatynski 423c515708 Consolidate AddExistingToSpace between Dialog and Just Me integrated flow 2021-05-13 09:46:45 +01:00
Michael Telatynski 565e41c3df Extract UntrustedDeviceDialog and fix e2ee icon 2021-05-12 17:04:24 +01:00
Michael Telatynski 607ca17971 Iterate beta feedback dialog 2021-05-12 16:11:38 +01:00
Michael Telatynski 03bd30d125 Fix colours used for the back button in space create menu 2021-05-12 10:48:06 +01:00
Michael Telatynski ea9be0dd4c
Merge pull request #6012 from matrix-org/t3chguy/fix/17238 
Add feedback mechanism for beta features, namely Spaces
 2021-05-11 17:46:21 +01:00
Michael Telatynski 7396ce76e5 Tweak the feedbacks a tad 2021-05-11 17:30:33 +01:00
Travis Ralston b1d5dc1194
Merge pull request #5993 from matrix-org/travis/voicemessages/scale 
Scale voice message clock with user's font size
 2021-05-11 10:25:36 -06:00
Michael Telatynski bf4c8f048f Add feedback mechanism for beta features 2021-05-11 15:58:19 +01:00
Michael Telatynski df72fbb22a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17179 
 Conflicts:
	src/i18n/strings/en_EN.json
 2021-05-11 14:07:47 +01:00
Michael Telatynski 2e19c7fd24 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
 2021-05-11 13:40:28 +01:00
Robin Townsend 7efbd2d930 Hide unencrypted badge from ForwardDialog preview 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-10 13:57:47 -04:00
Robin Townsend 503301aa89 Make rooms in ForwardDialog clickable 
…so that you can jump to a room easily once you've forwarded a message
there.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-10 13:00:06 -04:00
Robin Townsend bfba2b0b6f Push ForwardDialog scrollbar into the gutter 
…to give more space between it and the buttons.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-10 11:16:51 -04:00
Robin Townsend b9b237fc9a Replace forwarding UI with dialog 
Replaces the old forwarding UI with a dialog based on designs from
https://github.com/vector-im/element-web/issues/14690.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-08 21:11:06 -04:00
Travis Ralston b56d7c9ae8 Scale voice message clock with user's font size 
Fixes https://github.com/vector-im/element-web/issues/17185
 2021-05-07 19:27:52 -06:00
Travis Ralston 04d566e247
Merge pull request #5988 from matrix-org/travis/voicemessages/glitch-1 
Fix voice message playback being squished up against send button
 2021-05-07 08:00:45 -06:00
Michael Telatynski a8c4aabb52 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/i18n/strings/en_EN.json
 2021-05-07 11:50:49 +01:00
Michael Telatynski 9205b74641 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17176 2021-05-07 10:25:06 +01:00
Travis Ralston d270e232fd Fix voice message playback being squished up against send button 
In the style shuffle of https://github.com/matrix-org/matrix-react-sdk/pull/5970 the playback bar got squished up against the send button. This just fixes the selector to actually hit the composer-based recorder all the time, not just when recording.
 2021-05-06 21:41:04 -06:00
Tulir Asokan cc919452b5 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-05-07 00:07:51 +03:00
Travis Ralston d531e3d59f
Merge pull request #5971 from matrix-org/travis/files/visual 
Update visual style of plain files in the timeline
 2021-05-06 10:57:22 -06:00
Michael Telatynski d9912651d6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17176 
 Conflicts:
	src/components/structures/SpaceRoomDirectory.tsx
 2021-05-06 13:06:50 +01:00
J. Ryan Stinnett 683aec1066
Merge pull request #5833 from SimonBrandner/feed 
Support for multiple streams (not MSC3077)
 2021-05-06 11:20:09 +01:00
Michael Telatynski 90538c95aa Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 2021-05-06 08:05:14 +01:00
Travis Ralston 60e3a8ac77 Merge branch 'develop' into travis/files/visual 2021-05-05 13:47:33 -06:00
Travis Ralston 3e1265b9bb
Merge pull request #5970 from matrix-org/travis/voicemessages/colors 
Update colours and sizing for voice messages
 2021-05-05 11:09:18 -06:00
Michael Telatynski 70087b30bf Add disclaimer about subspaces being experimental in add existing dialog 2021-05-05 17:53:31 +01:00
Michael Telatynski 81b97590f6 fix styling of the disabled danger_outline button 2021-05-05 16:51:46 +01:00
Michael Telatynski 7cae566011
Merge pull request #5975 from matrix-org/t3chguy/fix/16891 
Add retry mechanism and progress bar to add existing to space dialog
 2021-05-05 16:32:31 +01:00
J. Ryan Stinnett 4bc5990071
Merge pull request #5755 from aaronraimist/warn-on-access-token-reveal 
Warn on access token reveal
 2021-05-05 16:32:12 +01:00
Michael Telatynski acce9a4548 Fix rounded progress bars 2021-05-05 11:50:55 +01:00
Michael Telatynski 07f5b6e8c4 Add retry mechanism and progress bar to add existing to space dialog 2021-05-05 11:45:12 +01:00
Travis Ralston ccdc9fbef6 Fix issue where composer styles were being applied to the timeline 2021-05-04 21:15:22 -06:00
Travis Ralston b0cb996cac Update visual style of plain files in the timeline 2021-05-04 21:13:37 -06:00
Travis Ralston a94c1a90c1 Update colours and sizing for voice messages 
Fixes https://github.com/vector-im/element-web/issues/17162
 2021-05-04 20:45:15 -06:00
Travis Ralston 54931cb43e Merge remote-tracking branch 'origin/develop' into travis/voicemessages/timeline 2021-05-04 09:05:04 -06:00
Travis Ralston ba2da6826f Support a dark theme for voice messages 
Fixes https://github.com/vector-im/element-web/issues/17137
 2021-05-03 16:08:38 -06:00
Travis Ralston 3f4ee9742a Simple rendering of voice messages in the timeline 
Fixes https://github.com/vector-im/element-web/issues/17138
 2021-05-03 11:41:14 -06:00
Šimon Brandner fe5fb1885f
Add styling for CallPreview and make it fixed 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-03 15:39:24 +02:00
Šimon Brandner b8cb72345c
Remove unnecessary margin 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-03 15:39:00 +02:00
Ayush PS b42872daa4 Fixed the Dial Pad and finalized the changes 2021-05-02 22:10:15 +05:30
Tulir Asokan 09f9916916 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-05-01 15:37:32 +03:00
Jaiwanth f766f985e4 Change cursor to not-allowed 2021-04-30 08:25:58 +05:30
Michael Telatynski 279654cc9e Design iterations based on PR feedback 2021-04-29 16:08:59 +01:00
Michael Telatynski a4f02937cb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 
 Conflicts:
	res/css/structures/_SpaceRoomView.scss
	src/components/structures/SpaceRoomView.tsx
 2021-04-29 09:52:21 +01:00
Michael Telatynski 9f8955fb6c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/16628 
 Conflicts:
	src/components/views/dialogs/AddExistingToSpaceDialog.tsx
 2021-04-28 22:49:36 +01:00
Michael Telatynski 1802adb4d2 Iterate styling and decoration for the beta prompts 2021-04-28 22:47:08 +01:00
Travis Ralston 6764b8d645 Change symbol names 2021-04-28 09:29:31 -06:00