Kerry
2e3f225520
Put room settings form elements in fieldsets ( #7311 )
...
* override default fieldset styles
Signed-off-by: Kerry Archibald <kerrya@element.io>
* SettingsFieldset component
Signed-off-by: Kerry Archibald <kerrya@element.io>
* test settings fieldset
Signed-off-by: Kerry Archibald <kerrya@element.io>
* refactor SettingsFlag styles
* use SettingsFieldset in room > securit settings
* use fieldset in urlpreviewsettings
Signed-off-by: Kerry Archibald <kerrya@element.io>
* use SettingsFieldset in AliasSettings
Signed-off-by: Kerry Archibald <kerrya@element.io>
* fieldset in room > roles settings
Signed-off-by: Kerry Archibald <kerrya@element.io>
* css lint
Signed-off-by: Kerry Archibald <kerrya@element.io>
* run i18n
Signed-off-by: Kerry Archibald <kerrya@element.io>
* fussy order
Signed-off-by: Kerry Archibald <kerrya@element.io>
* default export
Signed-off-by: Kerry Archibald <kerrya@element.io>
* fix copyright headers
Signed-off-by: Kerry Archibald <kerrya@element.io>
2021-12-09 18:44:22 +01:00
James Salter
5219b6be80
Analytics opt in for posthog ( #6936 )
...
* Add a new flag pseudonymousAnalyticsOptIn replacing analyticsOptIn, stored at account level, so people only need to opt in once.
* Show a toast in login to users that have analyticsOptIn set but not yet pseudonymousAnalyticsOptIn prompting them confirm the new method is okay. Update the copy of the existing opt-in toast. Don't notify users that previously opted out.
* Update the copy in settings
* Add a new learn more dialog
* Support a new config flag analyticsOwner which is used in these toasts when explaining which entity the data is sent to ("Help improve %(analyticsOwner)"). If unset, display brand. This allows deployments whose brand differs from the receiver of the analytics to explain the situation to their users (e.g. AcmeCorp badges their app, but explains the data is sent to Element, not them)
* The new opt-in and flags are only used when posthog is configured; prior to that there are no changes to UX or tracking behaviour.
2021-12-06 09:39:33 +11:00
Michael Telatynski
8fe582b094
Tweaks to informational architecture 1.1 ( #7052 )
...
* Move user avatar to Space panel
* Add room list header for 'Home' or 'Space Name' to room list
Add existing Space context menus to room list header
* Re-add pending room join spinner
* Iterate RoomListHeader plus context menu
* Iterate space context menu
* Iterate room list + interactions
* Move DND to new iA model
* Replace composer custom status management with usermenu one
* Cull Quick Actions
* Iterate minimized room list state
* delint
* Merge the RoomListNumResults into the RoomListHeader
* Make the search shortcut prompt semi-bold
* Iterate RoomListHeader based on design review
* Iterate UserMenu based on feedback
* Add name to expanded spacepanel usermenu button
* i18n
* Make room sub list aux button components more generic
* Change left panel explore button to only refer to room directory
* Iterate RoomListHeader
* Fix custom user status input field width in Chrome
* Bring back Notification settings button
* delint
* i18n
* post-merge fix
* iterate pr
* Remove unused state
* update copy
* Apply suggestions from PR review
* delint
* Update invite iconography
* Iterate Space context menu to match Figma
* Fix chevron alignment
* Fix edge case for RoomListHeader on metaspaces
* Wire up general rageshake-driven feedback mechanism
* Add IA1.1 info toast
* add missing alt attribute
* delint
* delint
* tweak ia toast priority
* e2e test account for new toast
* autofocus feedback field and remove old subheading
* tweak copy
* Iterate space panel colours to match Figma
* Iterate PR
* delint
* Fix feedback submission with object setting values
* iterate based on review
* Tweak colours and update splash image
* Tweaks based on review
* Remove room list prompt, made redundant by the big fat `+`
* Fix edge cases around User Menu positioning and dnd
* Add missing import, bad merge?
* Update aria label in e2e test
* Fix room list space rooms context menu explore button behaviour
* Tweak copy
* Revert order of options in the UserMenu
* Tweak copy
* i18n
2021-11-30 18:08:46 +00:00
Šimon Brandner
9db0ebb7f5
Task/colors 11 ( #7211 )
2021-11-29 12:52:09 +00:00
Andy Balaam
aec09dcad2
Show a spinner while waiting for a poll to be created ( #7189 )
2021-11-23 14:19:48 +00:00
Michael Telatynski
cdbe25bd36
Show room context details in forward dialog ( #7162 )
2021-11-23 09:35:01 +00:00
Andy Balaam
21c142c19d
Make the Add option button look disabled when it is ( #7164 )
2021-11-19 14:19:53 +00:00
Michael Weimann
f27eb04133
Adjust recovery key button sizes depending on text width ( #7134 )
2021-11-17 09:34:59 +00:00
Timo
556cfc7ed8
Add maximise widget functionality ( #7098 )
...
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-11-16 15:43:18 +01:00
Šimon Brandner
9abb2f5ff4
Color cleanup 8 ( #7108 )
...
* $accent-color -> $accent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $accent-bg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $notice-primary-color -> $alert
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $notice-primary-bg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $accent-50pct
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $warning-color -> $alert
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $accent-darker
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $orange-warning-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $warning-bg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $info-bg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-11-11 13:37:29 +00:00
Michael Telatynski
5ad3261cb2
Implement more meta-spaces ( #7077 )
2021-11-11 13:07:41 +00:00
Šimon Brandner
71d8946641
Color cleanup number 7 ( #7094 )
...
* $reaction-row-button-selected-border-color -> $accent-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $reaction-row-button-bg-color -> $header-panel-bg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $room-warning-bg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $button-link-bg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $tab-label-icon-bg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $tab-label-bg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $event-redacted-border-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $event-redacted-fg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $panel-divider-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $search-placeholder-color -> #61708b
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $search-bg-color -> #181b21
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $header-panel-border-color -> #000000
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $scrollbar-track-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $eventbubble-avatar-outline -> $background
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-11-10 09:46:33 +00:00
Šimon Brandner
07d9e93d67
Color cleanup number six ( #7050 )
...
* Remove $voip-decline-color and $voip-accept-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $dialog-background-bg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $mention-user-pill-bg-color -> $warning-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $plinth-bg-color -> $secondary-accent-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $input-lighter-fg-color -> $input-darker-fg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $input-valid-border-color -> $accent-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $input-invalid-border-color -> $warning-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $button-bg-color -> $accent-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $avatar-bg-color -> $background
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $preview-widget-fg-color -> $greyed-fg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $settings-profile-button-fg-color -> $settings-profile-overlay-placeholder-fg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $presence-online -> $accent-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $pinned-unread-color -> $notice-primary-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $event-highlight-fg-color -> $warning-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $tab-label-active-bg-color -> $accent-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $button-primary-bg-color -> $accent-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $button-danger-bg-color -> $notice-primary-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $button-link-fg-color -> $accent-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $togglesw-on-color -> $accent-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $slider-selection-color -> $accent-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $progressbar-fg-color -> $accent-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $authpage-body-bg-color -> $background
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Fix merge issue
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Fix second merge issue
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-11-08 11:50:53 +00:00
Andy Balaam
9c8e1d32e2
Rename mx_RadioButton to mx_StyledRadioButton to match class name ( #7083 )
2021-11-04 12:57:38 +00:00
Travis Ralston
73731cc478
Polls: Creation form & start event ( #7001 )
...
* PSFD-423: Permission check for polls dialog
* PSFD-423: Implement compound scrollable dialog and skeleton create poll
* PSFD-325: Ask the question
* PSFD-328: Ask for options
* PSFD-423: Ensure form submission semantics work for dialogs
* PSFD-328: Option semantics
* Can delete all option to end up with zero
* Minimum 2 to submit the form
* PSFD-316: Send poll start event
* Appease the linter
* PSFD-328: Reduce padding between options to account for field size
* Iterate per design
* Fix submission
2021-11-01 23:44:42 -06:00
Šimon Brandner
5c66bd6c7b
Add max-empty-lines
and no-eol-whitespace
to stylelint ( #7034 )
2021-10-26 08:23:23 +01:00
Rafael Gonçalves
12ad01db51
Show passphrase input label ( #6992 )
2021-10-22 15:50:11 +01:00
Šimon Brandner
0794be1e98
$notice-secondary-color -> $tertiary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:21:27 +02:00
Michael Telatynski
4118d13846
Merge pull request #6829 from matrix-org/t3chguy/fix/18969
2021-10-14 09:59:34 +01:00
Michael Telatynski
111ae75874
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969
...
Conflicts:
src/components/views/right_panel/UserInfo.tsx
2021-10-08 13:00:20 +01:00
Michael Telatynski
2483f1dc90
Add progress bar to restricted room upgrade dialog
2021-10-08 12:20:43 +01:00
Michael Telatynski
1d5a1c7a82
Merge pull request #6887 from matrix-org/t3chguy/fix/19216
2021-10-06 09:29:25 +01:00
Dariusz Niemczyk
17f59131d8
Merge pull request #6868 from SimonBrandner/task/colors-3-mk2
...
Color clean-up #3 mk2
2021-10-01 11:04:15 +02:00
Jaiwanth
1e90043eb3
Change colour variable for export dialog subheading
2021-09-30 20:58:03 +05:30
Michael Telatynski
8ac77c498f
Add progress bar to Community to Space migration tool
...
and invite-one-by-one to workaround Synapse ratelimits
2021-09-30 13:43:59 +01:00
Michael Telatynski
0f8069ac35
Switch ConfirmUserActionDialog over to using a Field
2021-09-28 16:22:27 +01:00
Michael Telatynski
2ac2358d93
Fix avatar getting chopped off
2021-09-28 16:22:05 +01:00
Šimon Brandner
71d1196692
Get rid of message-body-panel colors
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-27 09:04:51 +02:00
Šimon Brandner
02d42244a8
$user-tile-hover-bg-color -> $header-panel-bg-color
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-27 09:02:09 +02:00
Jaiwanth
d1e3d35d40
Change export bundle filename format, light theme for all exports and import jszip after export cta
2021-09-22 22:17:23 +05:30
Jaiwanth
94e4fb71c1
Merge branch 'develop' into export-conversations
2021-09-22 18:07:01 +05:30
Michael Telatynski
1858c63c4a
Allow options to cascade kicks/bans throughout spaces
2021-09-17 15:34:49 +01:00
Jaiwanth
7207329c15
Apply review suggestions
2021-08-13 23:44:07 +05:30
Šimon Brandner
8b59bf3d18
$tertiary-fg-color -> $tertiary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:19:29 +02:00
Šimon Brandner
10bc85724a
$secondary-fg-color -> $secondary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:19:26 +02:00
Šimon Brandner
e5fd19c332
$primary-fg-color -> $primary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:18:18 +02:00
Šimon Brandner
9ecd3b03f1
$quaternary-fg-color -> $quaternary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:17:37 +02:00
Šimon Brandner
2afee596a9
$primary-bg-color -> $background
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:17:34 +02:00
Jaiwanth
e88edba650
Merge branch 'develop' into export-conversations
2021-08-12 17:10:13 +05:30
Michael Telatynski
9d3569a577
Iterate PR based on feedback
2021-08-12 10:58:56 +01:00
Michael Telatynski
54d85a3864
Iterate PR based on feedback
2021-08-11 16:32:48 +01:00
Michael Telatynski
f7818e0169
iterate PR based on feedback
2021-08-06 12:05:14 +01:00
Michael Telatynski
a6e5112be0
Offer a way to create a space based on existing community
2021-08-04 10:37:35 +01:00
Jaiwanth
17e9cf4d2a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-07-30 12:17:31 +05:30
Michael Telatynski
94af6db201
Merge pull request #6424 from matrix-org/t3chguy/fix/18071
2021-07-29 15:57:26 +01:00
Michael Telatynski
3ee8f607c0
Switch dropdown out for radio interaction when leaving space
2021-07-29 15:50:18 +01:00
Michael Telatynski
493cd01ed3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071
...
Conflicts:
res/css/views/dialogs/_AddExistingToSpaceDialog.scss
src/utils/space.tsx
2021-07-29 15:22:52 +01:00
Michael Telatynski
efd8a2f9b0
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
...
Conflicts:
src/components/structures/SpaceRoomView.tsx
src/components/views/spaces/SpaceCreateMenu.tsx
src/i18n/strings/en_EN.json
2021-07-29 15:16:53 +01:00
Michael Telatynski
40493634ae
Iterate PR
2021-07-28 19:23:33 +01:00
Michael Telatynski
5d9e421de0
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091
2021-07-28 17:58:34 +01:00
Michael Telatynski
6123ccb2eb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
2021-07-28 17:45:15 +01:00
Travis Ralston
9707797d45
Merge pull request #6272 from SimonBrandner/fix/explicit-font/14163
...
Don't set `font-family` explicitly
2021-07-27 11:04:23 -06:00
Michael Telatynski
39d9ec3ced
Merge branch 'develop' into t3chguy/fix/18071
2021-07-27 15:02:59 +01:00
Jaiwanth
b91309be82
Apply suggestions from review
2021-07-26 23:40:27 +05:30
Michael Telatynski
2114e854f9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091
...
Conflicts:
src/components/structures/SpaceRoomView.tsx
2021-07-26 12:36:00 +01:00
Jaiwanth
06d84a16d0
Delint
2021-07-26 12:58:17 +05:30
Jaiwanth
30a64a1b5a
Gray out and hide some options during export
2021-07-26 12:41:36 +05:30
Jaiwanth
b04bfeda33
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations
2021-07-26 00:18:56 +05:30
Jaiwanth
3d4d1d32d9
Modify design according to the design team
2021-07-26 00:09:59 +05:30
Michael Telatynski
b89434fcbc
avoid abusing spans because you're too lazy to give things a class
2021-07-23 16:03:15 +01:00
Michael Telatynski
7ccc429bea
Change spaces beta feedback to not be so beta-centric
2021-07-23 15:47:11 +01:00
Michael Telatynski
358a4e5d3f
Merge pull request #6212 from matrix-org/t3chguy/fix/17686
2021-07-23 09:09:17 +01:00
Michael Telatynski
010baabfe6
Improve subspaces and some utilities around room/space creation
2021-07-23 08:46:20 +01:00
Germain Souquet
8a9d89ae85
Fix event tile cut off in share preview
2021-07-22 15:05:44 +02:00
Michael Telatynski
d147aaa984
delint and fix min-height issue
2021-07-21 11:27:36 +01:00
Michael Telatynski
fd64d37305
Add iconography to Create Room Dialog dropdown
...
Remove unused old stale feather-customised/globe.svg
2021-07-21 11:20:41 +01:00
Michael Telatynski
880dc26847
don't force height if the height can't change (no children edge)
2021-07-21 10:39:04 +01:00
Michael Telatynski
1b2d70d816
Prompt user to leave rooms/subspaces in a space when leaving space
2021-07-21 09:57:10 +01:00
Jaiwanth
fe2cac56f9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-07-19 12:57:27 +05:30
Michael Telatynski
dcb9b9b777
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/elements/MiniAvatarUploader.tsx
src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
src/i18n/strings/en_EN.json
src/settings/handlers/RoomSettingsHandler.ts
src/stores/SpaceStore.tsx
2021-07-15 10:04:48 +01:00
Andrew Morgan
f4788a6427
Add dialpad to transfer dialog + various dialpad UI improvements ( #6363 )
...
Co-authored-by: Germain <germain@souquet.com>
Co-authored-by: Andrew Morgan <andrew@amorgan.xyz>
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
2021-07-15 09:55:58 +01:00
Jaiwanth
6a4e2672f6
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-07-10 19:18:01 +05:30
Michael Telatynski
eb9f4c609a
Make CreateRoomDialog capable of creating restricted rooms in spaces
2021-07-06 10:10:47 +01:00
Michael Telatynski
c5ca98a3ad
Iterate SecurityRoomSettingsTab and ManageRestrictedJoinRuleDialog
2021-07-06 10:10:25 +01:00
Michael Telatynski
1b25ab930e
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/dialogs/AddExistingToSpaceDialog.tsx
2021-07-05 13:06:22 +01:00
David Baker
0cee0db9df
Fix icon size in passphrase prompt
2021-07-02 20:38:07 +01:00
Michael Telatynski
e8f0412fe3
Add way to manage Restricted join rule in Room Settings
2021-07-02 14:51:55 +01:00
Jaiwanth
637e3afa48
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-06-29 11:31:30 +05:30
Jaiwanth
025a7eb9a5
Iterate PR
2021-06-29 10:36:24 +05:30
Michael Telatynski
56514d51a6
Fix tiny scrollbar dot on chrome/electron in Forward Dialog
2021-06-28 15:37:28 +01:00
Jaiwanth
e505646f21
Finish dialog implementation of export settings
2021-06-26 21:54:10 +05:30
Šimon Brandner
ffc6f96d45
Remove explicitly set font-family
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-26 09:12:45 +02:00
Šimon Brandner
fbe3eb7726
Remove unused class
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-26 09:00:42 +02:00
Michael Telatynski
6d3e7730ef
Fix two PRs duplicating the css attribute
2021-06-24 11:40:49 +01:00
Michael Telatynski
71414904fc
Merge pull request #6201 from matrix-org/t3chguy/fix/15051
2021-06-24 11:20:12 +01:00
Michael Telatynski
26d8c4d2e6
Improve design of the multi inviter error dialog
2021-06-24 10:03:32 +01:00
Michael Telatynski
0e2f617d94
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15051
2021-06-24 09:33:39 +01:00
Michael Telatynski
47be728eb2
Fix invite dialog being cut off when it has limited results
2021-06-24 09:21:52 +01:00
Michael Telatynski
384bb3af2e
Fix layout regression in the invite dialog for few results
2021-06-16 10:37:34 +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
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
Germain Souquet
15132074e2
Restore copy button icon when sharing permalink
2021-06-09 13:44:31 +01: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
90bb7c1482
Switch Space Settings for a tabbed view with a bunch more settings exposed
2021-06-08 16:33:47 +01: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
e891d18fa2
Add my email to my copyright notices
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 21:41:28 -04:00
Michael Telatynski
0c97d90fb9
Iterate PR based on feedback
2021-06-03 16:44:28 +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
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