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

 Conflicts:

	package.json

	src/components/views/spaces/SpacePanel.tsx

	src/i18n/strings/en_EN.json

	src/stores/SpaceStore.tsx

	yarn.lock

2021-06-22 21:15:53 +01:00

..

accessibility

Update Enzyme adapter name

2021-06-09 11:57:29 +01:00

autocomplete

Enable indent rule and fix indent

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

components

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

2021-06-22 21:15:53 +01:00

editor

Fix deserialize test

2021-05-01 12:28:18 +02:00

end-to-end-tests

Remove unnecessary comment

2021-06-17 10:20:43 +01:00

i18n

Fix languages.json

2017-06-01 21:10:32 +02:00

i18n-test

Attempt to fix tests some more

2020-09-15 13:19:47 +01:00

img

Fix a load of warnings in the tests

2016-10-11 14:20:40 +01:00

notifications

Remove a couple more files from eslintignore

2020-10-30 18:33:33 +00:00

stores

mock new settings in tests

2021-06-16 09:14:07 +01:00

utils

remove unused imports

2021-06-16 12:12:00 +01:00

.eslintrc.js

de-lint MegolmExportEncryption + test

2017-06-08 14:29:53 +01:00

CallHandler-test.ts

Lint the typescript tests

2021-06-04 16:52:50 +01:00

createRoom-test.js

Fix tests failing to load skin

2021-03-09 10:13:16 -07:00

DecryptionFailureTracker-test.js

fix more private field accesses in tests

2021-06-17 15:23:29 +01:00

KeyBindingsManager-test.ts

Lint the typescript tests

2021-06-04 16:52:50 +01:00

mock-clock.js

Merge remote-tracking branch 'origin/t3chguy/jest' into travis/sourcemaps

2020-01-09 16:06:46 -07:00

ScalarAuthClient-test.js

Fix ScalarAuthClient test

2021-04-26 15:41:19 +01:00

setupTests.js

Add TextEncoder polyfill for test run

2021-06-11 12:33:02 +01:00

skinned-sdk.js

remove stale references to MatrixToolbar

2020-05-30 12:36:17 +01:00

Terms-test.js

Merge remote-tracking branch 'origin/t3chguy/jest' into travis/sourcemaps

2020-01-09 16:06:46 -07:00

test-utils.js

Merge branch 'develop' into improved-forwarding-ui

2021-06-05 11:04:17 -04:00

UserActivity-test.js

lolex renamed to @sinonjs/fake-timers

2021-01-27 12:31:37 +00:00