Germain Souquet 2d14be9cef Merge branch 'develop' into gsouquet/compact-composer-18533

2021-08-25 18:07:36 +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

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

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

context_menus

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

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

dialogs

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

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

directory

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

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

elements

Merge pull request #6604 from SimonBrandner/task/colors-2

2021-08-24 12:37:18 -06: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

Fix a merge regression

2021-08-24 09:33:16 +02:00

right_panel

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

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

room_settings

Remove some unused components

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

rooms

Merge branch 'develop' into gsouquet/compact-composer-18533

2021-08-25 18:07:36 +01:00

settings

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

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

spaces

Remove line of unknown origin

2021-08-24 08:59:12 +02: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