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

..

security

Add a button to reset personal encryption state during login

2021-03-30 15:37:06 -06:00

_AddExistingToSpaceDialog.scss

Merge pull request #6030 from matrix-org/t3chguy/fix/17276

2021-05-14 11:23:46 +01:00

_AddressPickerDialog.scss

…

_Analytics.scss

…

_BetaFeedbackDialog.scss

Iterate beta feedback dialog

2021-05-12 16:11:38 +01:00

_BugReportDialog.scss

…

_ChangelogDialog.scss

…

_ChatCreateOrReuseChatDialog.scss

…

_CommunityPrototypeInviteDialog.scss

…

_ConfirmUserActionDialog.scss

…

_CreateCommunityPrototypeDialog.scss

…

_CreateGroupDialog.scss

…

_CreateRoomDialog.scss

…

_DeactivateAccountDialog.scss

…

_DevtoolsDialog.scss

Appease the linter

2021-02-18 15:30:03 -07:00

_EditCommunityPrototypeDialog.scss

…

_FeedbackDialog.scss

…

_ForwardDialog.scss

Hide download links from forward dialog preview

2021-06-07 19:19:14 -04:00

_GroupAddressPicker.scss

…

_HostSignupDialog.scss

Ensure HostSignupDialog border colour matches light theme

2021-03-04 11:07:14 +02:00

_IncomingSasDialog.scss

…

_InviteDialog.scss

Iterate PR based on feedback

2021-06-03 16:44:28 +01:00

_KeyboardShortcutsDialog.scss

…

_MessageEditHistoryDialog.scss

…

_ModalWidgetDialog.scss

…

_NewSessionReviewDialog.scss

…

_RegistrationEmailPromptDialog.scss

…

_RoomSettingsDialog.scss

…

_RoomSettingsDialogBridges.scss

…

_RoomUpgradeDialog.scss

…

_RoomUpgradeWarningDialog.scss

…

_ServerOfflineDialog.scss

…

_ServerPickerDialog.scss

…

_SetEmailDialog.scss

…

_SettingsDialog.scss

…

_ShareDialog.scss

Restore copy button icon when sharing permalink

2021-06-09 13:44:31 +01:00

_SlashCommandHelpDialog.scss

…

_SpaceSettingsDialog.scss

Spaces move away from Form Buttons

2021-03-24 13:15:31 +00:00

_TabbedIntegrationManagerDialog.scss

…

_TermsDialog.scss

…

_UntrustedDeviceDialog.scss

Extract UntrustedDeviceDialog and fix e2ee icon

2021-05-12 17:04:24 +01:00

_UploadConfirmDialog.scss

…

_UserSettingsDialog.scss

…

_WidgetCapabilitiesPromptDialog.scss

…

_WidgetOpenIDPermissionsDialog.scss

…