Michael Telatynski 390b05617c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 ... Conflicts: src/components/views/dialogs/CreateRoomDialog.tsx src/components/views/dialogs/RoomUpgradeDialog.tsx src/components/views/dialogs/RoomUpgradeWarningDialog.tsx src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx		2021-07-21 10:46:41 +01:00
..
accessibility	Conform to new react and typescript eslint rules	2021-07-19 22:43:11 +01:00
autocomplete	Auto-fix lint errors	2021-06-29 13:11:58 +01:00
components	Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile	2021-07-20 13:15:04 +02:00
editor	Fix tests	2021-07-15 10:59:52 +01:00
end-to-end-tests	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686	2021-07-15 10:04:48 +01:00
i18n	…
i18n-test	…
img	…
notifications	Auto-fix lint errors	2021-06-29 13:11:58 +01:00
stores	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686	2021-07-19 16:47:31 +01:00
utils	delint	2021-07-12 13:52:10 -06:00
.eslintrc.js	Migrate to `eslint-plugin-matrix-org`	2021-06-29 12:51:13 +01:00
CallHandler-test.ts	Lint the typescript tests	2021-06-04 16:52:50 +01:00
DecryptionFailureTracker-test.js	fix more private field accesses in tests	2021-06-17 15:23:29 +01:00
KeyBindingsManager-test.ts	Comply with new member-delimiter-style rule	2021-07-01 23:23:03 +01:00
ScalarAuthClient-test.js	Auto-fix lint errors	2021-06-29 13:11:58 +01:00
Terms-test.js	Auto-fix lint errors	2021-06-29 13:11:58 +01:00
UserActivity-test.js	…
createRoom-test.js	Conform to new react and typescript eslint rules	2021-07-19 22:43:11 +01:00
setupTests.js	Add TextEncoder polyfill for test run	2021-06-11 12:33:02 +01:00
skinned-sdk.js	Auto-fix lint errors	2021-06-29 13:11:58 +01:00
test-utils.js	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686	2021-07-19 16:47:31 +01:00