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

 Conflicts:

	src/components/views/spaces/SpaceCreateMenu.tsx

2021-05-11 13:40:28 +01:00

..

@types

Merge pull request #5833 from SimonBrandner/feed

2021-05-06 11:20:09 +01:00

accessibility

…

actions

…

async-components/views/dialogs

Merge pull request #5934 from aaronraimist/security-phrase-2

2021-05-04 11:43:23 +01:00

autocomplete

…

components

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

2021-05-11 13:40:28 +01:00

contexts

…

customisations

Scale all mxc thumbs using device pixel ratio for hidpi

2021-04-26 18:25:49 +01:00

dispatcher

Make CallHandler emit CallChangeRoom

2021-04-28 11:49:07 +02:00

editor

Revert to internal option

2021-05-10 17:36:33 +01:00

effects

…

emojipicker

…

hooks

…

i18n/strings

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

2021-05-11 13:40:28 +01:00

indexing

Improve formatting

2021-04-29 19:57:02 +02:00

integrations

…

mjolnir

…

models

…

notifications

…

rageshake

…

resizer

…

settings

last minute copy tweak

2021-05-07 11:56:41 +01:00

stores

short circuit automatic switch to related space behaviour and fix tests

2021-05-07 11:08:18 +01:00

toasts

…

usercontent

…

utils

Merge pull request #5981 from matrix-org/jryans/upload-preview-mimetype

2021-05-10 10:21:35 +01:00

voice

Match designs more closely with +1 sample

2021-05-04 20:55:35 -06:00

widgets

…

ActiveRoomObserver.ts

…

AddThreepid.js

…

Analytics.tsx

…

AsyncWrapper.js

…

Avatar.ts

Guard all isSpaceRoom calls behind the labs flag

2021-05-05 23:59:07 +01:00

BasePlatform.ts

Do not throw on setLanguage

2021-04-27 15:11:49 +01:00

boundThreepids.js

…

CallHandler.tsx

Make CallHandler emit CallChangeRoom

2021-04-28 11:49:07 +02:00

CallMediaHandler.js

…

ContentMessages.tsx

…

CountlyAnalytics.ts

…

createRoom.ts

…

DateUtils.ts

…

DecryptionFailureTracker.js

…

DeviceListener.ts

…

email.ts

…

emoji.ts

…

GroupAddressPicker.js

Improve formatting

2021-04-29 19:57:02 +02:00

groups.js

…

HtmlUtils.tsx

Revert to internal option

2021-05-10 17:36:33 +01:00

IdentityAuthClient.js

Enable indent rule and fix indent

2021-04-27 17:23:27 +02:00

ImageUtils.ts

…

index.js

…

KeyBindingsDefaults.ts

…

KeyBindingsManager.ts

…

Keyboard.ts

…

languageHandler.tsx

…

Lifecycle.ts

…

linkify-matrix.js

…

Livestream.ts

…

Login.ts

…

Markdown.js

…

MatrixClientPeg.ts

…

Modal.tsx

…

NodeAnimator.js

…

Notifier.ts

…

PageTypes.js

…

PasswordReset.js

Enable indent rule and fix indent

2021-04-27 17:23:27 +02:00

phonenumber.ts

…

PlatformPeg.ts

…

Presence.ts

…

ratelimitedfunc.js

…

Registration.js

…

Resend.js

…

Roles.ts

…

RoomAliasCache.js

…

RoomInvite.js

…

RoomNotifs.js

…

RoomNotifsTypes.ts

…

Rooms.js

…

ScalarAuthClient.ts

Add types to ScalarAuthClient

2021-04-27 11:22:17 +01:00

ScalarMessaging.js

…

SdkConfig.ts

…

Searching.js

…

SecurityManager.ts

…

SendHistoryManager.ts

…

shouldHideEvent.ts

…

Skinner.js

…

SlashCommands.tsx

Add dev dependency for parse5 typings

2021-05-07 10:11:56 +01:00

Terms.ts

Remove redundant parameter initialisers

2021-04-26 17:12:31 +01:00

TextForEvent.js

Improve formatting

2021-04-29 19:57:02 +02:00

theme.js

…

Tinter.js

…

Unread.js

…

UserActivity.ts

…

UserAddress.js

…

verification.js

…

VoipUserMapper.ts

…

WhoIsTyping.ts

…