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

 Conflicts:

	src/components/structures/LoggedInView.tsx

	src/stores/SpaceStore.tsx

2021-09-06 11:41:09 +01:00

..

tabs

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

2021-09-06 11:41:09 +01:00

_AvatarSetting.scss

Fix aspect ratio of avatar before clicking Save

2020-10-14 10:57:34 +01:00

_CrossSigningPanel.scss

Place cross-signing action buttons on a single row

2020-09-16 15:03:06 +01:00

_DevicesPanel.scss

I have added spacing, as devices are very hard to read otherwise

2020-02-02 18:47:16 +01:00

_E2eAdvancedPanel.scss

Adding the files would help

2020-03-25 18:47:57 +00:00

_EmailAddresses.scss

Add copyright headers

2019-08-06 12:43:30 +01:00

_IntegrationManager.scss

It's called an "Integration Manager" (singular)

2019-11-20 20:14:25 -07:00

_LayoutSwitcher.scss

$primary-fg-color -> $primary-content

2021-08-12 17:18:18 +02:00

_Notifications.scss

$secondary-fg-color -> $secondary-content

2021-08-12 17:19:26 +02:00

_PhoneNumbers.scss

Add controls for toggling discovery in user settings

2019-08-08 11:35:35 +01:00

_ProfileSettings.scss

Fix font

2021-08-02 15:38:45 +02:00

_SecureBackupPanel.scss

Add independent set up / reset actions in Settings

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

_SetIdServer.scss

Touch up settings: alignment, spacing, error states

2019-08-20 13:20:07 -06:00

_SetIntegrationManager.scss

Add the toggle switch for provisioning

2019-11-20 20:05:32 -07:00

_SpellCheckLanguages.scss

Fix licenses

2021-02-18 19:40:24 +01:00

_UpdateCheckButton.scss

Give contextual feedback for manual update check instead of banner

2020-05-29 18:24:45 +01:00