Paulo Pinto
|
40ead34c08
|
Add test for textForPinnedEvent
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
|
2021-07-27 17:14:50 +01:00 |
|
Michael Telatynski
|
5ccd02dd6e
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/eslint1
Conflicts:
src/components/views/dialogs/CreateRoomDialog.tsx
src/components/views/messages/MImageBody.tsx
|
2021-07-23 10:42:46 +01:00 |
|
Michael Telatynski
|
f5630acea7
|
Adhere to better eslint rules
|
2021-07-23 10:35:10 +01:00 |
|
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 |
|
Šimon Brandner
|
dd6379cf4b
|
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-20 13:15:04 +02:00 |
|
Michael Telatynski
|
ce78cdf4ad
|
Conform to new react and typescript eslint rules
|
2021-07-19 22:43:11 +01:00 |
|
Michael Telatynski
|
de42a00ca4
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
Conflicts:
src/components/views/avatars/RoomAvatar.tsx
test/stores/SpaceStore-test.ts
test/test-utils.js
|
2021-07-19 16:47:31 +01:00 |
|
Michael Telatynski
|
f7767bf09c
|
Merge pull request #6393 from robintown/match-avatar-colors
|
2021-07-17 14:12:29 +01:00 |
|
Šimon Brandner
|
16ed5c6645
|
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-16 21:43:33 +02:00 |
|
Robin Townsend
|
eefadf6a46
|
Fix tests
Signed-off-by: Robin Townsend <robin@robin.town>
|
2021-07-16 15:30:26 -04:00 |
|
Michael Telatynski
|
831c482371
|
Stub out MatrixClient::isUserIgnored for tests
|
2021-07-15 18:17:07 +01:00 |
|
Michael Telatynski
|
316b21408d
|
Fix tests
|
2021-07-15 10:59:52 +01:00 |
|
Michael Telatynski
|
dcb9b9b777
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
Conflicts:
src/components/views/elements/MiniAvatarUploader.tsx
src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
src/i18n/strings/en_EN.json
src/settings/handlers/RoomSettingsHandler.ts
src/stores/SpaceStore.tsx
|
2021-07-15 10:04:48 +01:00 |
|
Germain
|
c7c29f2119
|
Merge pull request #6365 from psrpinto/fix/naming
|
2021-07-15 08:07:03 +01:00 |
|
Paulo Pinto
|
6884b2aa6d
|
Standardise spelling of identity server
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
|
2021-07-13 16:28:43 +01:00 |
|
Paulo Pinto
|
7a8400e5c7
|
Standardise spelling and casing of homeserver
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
|
2021-07-13 16:28:43 +01:00 |
|
Travis Ralston
|
0e2bcb474d
|
delint
|
2021-07-12 13:52:10 -06:00 |
|
Travis Ralston
|
ec0f940ef0
|
Adjust recording waveform behaviour for voice messages
Fixes https://github.com/vector-im/element-web/issues/17683
|
2021-07-12 13:48:01 -06:00 |
|
Michael Telatynski
|
f5f4be88f0
|
Update tests to expect LinkPreviewGroup behaviour
|
2021-07-12 08:34:26 +01:00 |
|
Šimon Brandner
|
a90b8f32f1
|
Add some tests
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-09 16:45:04 +02:00 |
|
Michael Telatynski
|
f412fb44a7
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
Conflicts:
src/SlashCommands.tsx
src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
src/createRoom.ts
|
2021-07-09 08:13:39 +01:00 |
|
Michael Telatynski
|
00a3f5d469
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into revert-6135-t3chguy/fix/17494
|
2021-07-08 13:29:10 +01:00 |
|
Šimon Brandner
|
9c67679b35
|
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
|
2021-07-08 13:30:57 +02:00 |
|
Michael Telatynski
|
4a6af5a4d7
|
fix test missing required prop
|
2021-07-07 18:12:31 +01:00 |
|
Germain
|
209cafb1f5
|
Merge pull request #6308 from SimonBrandner/burn-sdk-get-comp-with-fire
|
2021-07-07 16:30:54 +01:00 |
|
Germain Souquet
|
5fb7dbee3e
|
Do not generate a lockfile when running in CI
|
2021-07-07 16:11:47 +02:00 |
|
Michael Telatynski
|
06284fe73d
|
Update e2e tests
|
2021-07-06 12:05:06 +01:00 |
|
Michael Telatynski
|
04c923bd75
|
fix tests by including client field on the Room stub and stubbing getJoinedMemberCount
|
2021-07-06 11:35:56 +01:00 |
|
Michael Telatynski
|
9d8acd1af0
|
stub getJoinRule
|
2021-07-06 10:44:09 +01:00 |
|
Michael Telatynski
|
0ca4a958f7
|
fix getCapabilities stub
|
2021-07-06 10:34:50 +01:00 |
|
Michael Telatynski
|
3301763f12
|
stub getCapabilities in tests
|
2021-07-06 10:19:33 +01:00 |
|
Šimon Brandner
|
b36a727a09
|
Fourth batch of burning
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-02 18:15:05 +02:00 |
|
Michael Telatynski
|
b17d72c399
|
fix duplicate import
|
2021-07-02 14:54:10 +01:00 |
|
Šimon Brandner
|
b014763cd2
|
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-02 13:14:14 +02:00 |
|
Michael Telatynski
|
82119a08f7
|
Merge branch 'develop' into t3chguy/ts/11
|
2021-07-02 11:03:54 +01:00 |
|
David Baker
|
80f5232217
|
Comply with new member-delimiter-style rule
Just `eslint --fix` with rule from
https://github.com/matrix-org/eslint-plugin-matrix-org/pull/9 in place
|
2021-07-01 23:23:03 +01:00 |
|
Michael Telatynski
|
88f691776f
|
Use sleep from js-sdk as no point duplicating it
|
2021-07-01 22:55:27 +01:00 |
|
David Baker
|
08176beb58
|
Kill mock-clock
We already import sinon's one in UserActivitytest, so use that here too.
|
2021-07-01 21:52:15 +01:00 |
|
David Baker
|
543fe6382d
|
Fix linting in tests
Or in the case of one test, disbale just the one rule it breaks
|
2021-07-01 20:54:04 +01:00 |
|
David Baker
|
ee9be5438e
|
eslint --fix
|
2021-07-01 20:43:05 +01:00 |
|
Michael Telatynski
|
e768ecb3d0
|
Typescript conversion of Composer components and more
|
2021-06-30 13:01:26 +01:00 |
|
J. Ryan Stinnett
|
ae0a8b8da4
|
Auto-fix lint errors
|
2021-06-29 13:11:58 +01:00 |
|
J. Ryan Stinnett
|
71116bfa27
|
Migrate to eslint-plugin-matrix-org
This migrates to the new plugin form of our custom ESLint configs. As part of
this, some packages are de-duplicated, configs streamlined, etc.
|
2021-06-29 12:51:13 +01:00 |
|
Michael Telatynski
|
b60c2c5d55
|
Fix e2e test right panel back behaviour
|
2021-06-29 10:37:30 +01:00 |
|
Germain
|
53a6089cc9
|
Merge pull request #6268 from matrix-org/gsouquet/upgrade-puppeteer
|
2021-06-28 10:28:56 +01:00 |
|
Germain Souquet
|
96857ab7f7
|
Fix end-to-end tests rejectToast
|
2021-06-28 09:01:04 +01:00 |
|
Germain Souquet
|
2672516b6a
|
Upgrade puppeteer to use newer version of Chrome
|
2021-06-25 14:47:16 +01:00 |
|
Šimon Brandner
|
0df6200dd0
|
Convert MemberList-test to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-23 16:00:13 +02:00 |
|
Travis Ralston
|
c316eb841a
|
Merge pull request #6179 from aaronraimist/open-local-addresses
Open local addresses section by default when there are no existing local addresses
|
2021-06-22 14:48:02 -06:00 |
|
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 |
|