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

 Conflicts:

	res/css/views/dialogs/_AddExistingToSpaceDialog.scss

	src/utils/space.tsx

2021-07-29 15:22:52 +01:00

..

audio_messages

Merge pull request #6459 from matrix-org/t3chguy/eslint1

2021-07-23 16:23:38 +01:00

auth

Fix grecaptcha regression

2021-07-29 12:39:32 +02:00

avatars

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

2021-07-23 10:42:46 +01:00

beta

only show space beta tweaks if you have the beta enabled as they do nothing otherwise

2021-07-15 08:29:50 +01:00

context_menus

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

2021-07-26 12:36:00 +01:00

dialogs

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

2021-07-29 15:22:52 +01:00

directory

Conform to new react and typescript eslint rules

2021-07-19 22:43:11 +01:00

elements

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

2021-07-28 17:58:34 +01:00

emojipicker

Adhere to better eslint rules

2021-07-23 10:35:10 +01:00

groups

Adhere to better eslint rules

2021-07-23 10:35:10 +01:00

host_signup

Conform to new react and typescript eslint rules

2021-07-19 22:43:11 +01:00

messages

Merge branch 'develop' into gsouquet/fix-18132

2021-07-29 10:27:00 +02:00

right_panel

Adhere to better eslint rules

2021-07-23 10:35:10 +01:00

room_settings

Conform to new react and typescript eslint rules

2021-07-19 22:43:11 +01:00

rooms

Typo

2021-07-27 17:14:39 +01:00

settings

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

2021-07-23 10:42:46 +01:00

spaces

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

2021-07-29 15:22:52 +01:00

terms

Conform to new react and typescript eslint rules

2021-07-19 22:43:11 +01:00

toasts

Conform to new react and typescript eslint rules

2021-07-19 22:43:11 +01:00

verification

Conform to new react and typescript eslint rules

2021-07-19 22:43:11 +01:00

voip

Merge pull request #6472 from SimonBrandner/fix/call-view/18221

2021-07-28 11:10:37 +01:00