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

 Conflicts:

	src/components/views/dialogs/LeaveSpaceDialog.tsx

	src/i18n/strings/en_EN.json

2021-09-27 11:19:49 +01:00

..

audio_messages

$tertiary-fg-color -> $tertiary-content

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

auth

$primary-bg-color -> $background

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

avatars

Revert "$avatar-bg-color -> $background"

2021-08-24 09:04:17 +02:00

beta

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

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

context_menus

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

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

dialogs

Allow options to cascade kicks/bans throughout spaces

2021-09-17 15:34:49 +01:00

directory

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

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

elements

More prefers-reduced-motion friendliness

2021-09-21 17:59:13 +02:00

emojipicker

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

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

groups

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

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

messages

Merge branch 'develop' into gsouquet/threaded-messaging-2349

2021-08-25 08:53:16 +01:00

right_panel

Merge branch 'develop' into gsouquet/threaded-messaging-2349

2021-08-25 08:53:16 +01:00

room_settings

Remove some unused components

2020-08-20 20:47:02 -06:00

rooms

move timestamp to the right in thread's context

2021-09-24 11:44:11 +01:00

settings

Use new SCSS vars

2021-09-08 15:30:19 +01:00

spaces

Allow options to cascade kicks/bans throughout spaces

2021-09-17 15:34:49 +01:00

terms

Use variables for the rem values.

2020-03-31 15:26:23 +01:00

toasts

Merge remote-tracking branch 'upstream/develop' into task/colors-2

2021-08-24 08:57:12 +02:00

verification

Fix sas verification buttons to match figma and remove useless inDialog prop from EncryptionPanel.js

2020-04-07 19:03:12 +01:00

voip

Merge pull request #6639 from SimonBrandner/feature/voice-activity

2021-08-25 09:16:37 -06:00