Michael Telatynski c1cf8db78f Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15181 ...

 Conflicts:

	src/components/views/settings/tabs/user/GeneralUserSettingsTab.js

	src/i18n/strings/en_EN.json

	src/settings/Settings.ts

	src/settings/UIFeature.ts

2020-09-17 13:55:11 +01:00

..

account

Move tooltip to ts

2020-05-25 13:40:05 +01:00

discovery

Appease the linter by turning it off

2020-04-01 14:45:54 -06:00

tabs

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15181

2020-09-17 13:55:11 +01:00

AvatarSetting.js

remove upload icon

2020-07-07 12:16:16 +02:00

BridgeTile.js

Respect user preference for whether pills should have an avatar or not

2020-09-02 17:26:23 +01:00

ChangeAvatar.js

Remove create-react-class

2020-08-29 12:14:16 +01:00

ChangeDisplayName.js

Remove create-react-class

2020-08-29 12:14:16 +01:00

ChangePassword.js

Remove create-react-class

2020-08-29 12:14:16 +01:00

CrossSigningPanel.js

Add independent set up / reset actions in Settings

2020-09-08 18:01:56 +01:00

DevicesPanel.js

Use singular text on 'delete sessions' button for SSO

2020-04-09 16:18:12 -06:00

DevicesPanelEntry.js

Create and use stylised checkboxes

2020-05-28 22:33:00 +01:00

E2eAdvancedPanel.js

Tweak Security settings section headers

2020-09-03 15:41:17 +01:00

EventIndexPanel.js

Replace Riot with Element in docs and comments

2020-08-03 18:33:36 +01:00

IntegrationManager.js

Move dispatcher into a subdirectory

2020-05-13 21:07:50 -06:00

Notifications.js

Remove create-react-class

2020-08-29 12:14:16 +01:00

ProfileSettings.js

Profile settings should never show a disambiguated display name

2020-06-04 09:50:19 +01:00

SecureBackupPanel.js

undo change

2020-09-16 16:10:24 +01:00

SetIdServer.js

Set field validity (ie. border colour) correctly

2020-06-26 18:50:05 +01:00

SetIntegrationManager.js

Fix imports for SettingLevel to point at new file

2020-07-28 11:53:43 -06:00

UpdateCheckButton.tsx

Fix eslint ts override tsx matching and delint

2020-08-29 01:11:08 +01:00