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
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
9c67679b35
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
2021-07-08 13:30:57 +02:00
4a6af5a4d7
fix test missing required prop
2021-07-07 18:12:31 +01:00
209cafb1f5
Merge pull request #6308 from SimonBrandner/burn-sdk-get-comp-with-fire
2021-07-07 16:30:54 +01:00
5fb7dbee3e
Do not generate a lockfile when running in CI
2021-07-07 16:11:47 +02:00
06284fe73d
Update e2e tests
2021-07-06 12:05:06 +01:00
04c923bd75
fix tests by including client field on the Room stub and stubbing getJoinedMemberCount
2021-07-06 11:35:56 +01:00
9d8acd1af0
stub getJoinRule
2021-07-06 10:44:09 +01:00
0ca4a958f7
fix getCapabilities stub
2021-07-06 10:34:50 +01:00
3301763f12
stub getCapabilities in tests
2021-07-06 10:19:33 +01:00
b36a727a09
Fourth batch of burning
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 18:15:05 +02:00
b17d72c399
fix duplicate import
2021-07-02 14:54:10 +01:00
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
82119a08f7
Merge branch 'develop' into t3chguy/ts/11
2021-07-02 11:03:54 +01:00
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
88f691776f
Use sleep from js-sdk as no point duplicating it
2021-07-01 22:55:27 +01:00
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
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
ee9be5438e
eslint --fix
2021-07-01 20:43:05 +01:00
e768ecb3d0
Typescript conversion of Composer components and more
2021-06-30 13:01:26 +01:00
ae0a8b8da4
Auto-fix lint errors
2021-06-29 13:11:58 +01:00
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
b60c2c5d55
Fix e2e test right panel back behaviour
2021-06-29 10:37:30 +01:00
53a6089cc9
Merge pull request #6268 from matrix-org/gsouquet/upgrade-puppeteer
2021-06-28 10:28:56 +01:00
96857ab7f7
Fix end-to-end tests rejectToast
2021-06-28 09:01:04 +01:00
2672516b6a
Upgrade puppeteer to use newer version of Chrome
2021-06-25 14:47:16 +01:00
0df6200dd0
Convert MemberList-test to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 16:00:13 +02:00
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
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
59052b1eb7
Merge pull request #6199 from matrix-org/t3chguy/fix/17665
2021-06-22 17:46:57 +01:00
e3e6b74272
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665
...
Conflicts:
src/stores/SpaceStore.tsx
2021-06-22 17:38:05 +01:00
8a3dc1bbdf
fix tests
2021-06-18 17:56:18 +01:00
f96c366aa4
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-18 17:07:43 +02:00
35e68b8aa5
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665
2021-06-17 15:45:32 +01:00
017e0ba40f
fix more private field accesses in tests
2021-06-17 15:23:29 +01:00
949532c297
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
2021-06-17 15:53:25 +02:00
48e090abcc
Remove unnecessary comment
2021-06-17 10:20:43 +01:00
e7fde2686f
remove unused imports
2021-06-16 12:12:00 +01:00
9f8d04ab9a
Fix passing variable down to evaluate context
2021-06-16 11:39:04 +01:00
bceee7978e
improve naming of tests
2021-06-16 09:30:47 +01:00
9e20e5dfc4
mock new settings in tests
2021-06-16 09:14:07 +01:00
19cae42161
Benchmark multiple common user scenario
2021-06-15 15:06:00 +01:00
7310d35d7f
Merge branch 'develop' into gsouquet/benchmark-tracking
2021-06-15 11:45:11 +01:00
a63d9220d2
Clear outstanding TODOs
2021-06-15 08:26:46 +01:00
66fce64ee0
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282
...
Conflicts:
package.json
yarn.lock
2021-06-14 21:39:06 +01:00
91df392a2a
Merge pull request #5880 from SimonBrandner/show-username
2021-06-14 21:34:01 +01:00
2879b9086c
Use alphabet from js-sdk
2021-06-14 21:32:11 +01:00
8fd72fcf79
Iterate algorithm, base it on new js-sdk string lib
2021-06-14 21:28:32 +01:00
7000176572
Add workflow steps to track measurements
2021-06-14 14:53:22 +01:00
4af2675e23
stash bigint support
2021-06-14 14:37:05 +01:00
b8458c0ae3
fix test maybe
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-06-11 23:58:20 -05:00
3d4411390f
write a shedload more tests
2021-06-11 16:28:07 +01:00
37484e3fc4
Add TextEncoder polyfill for test run
2021-06-11 12:33:02 +01:00
a4fa2779d4
Iterate lexicographic ordering implementation
2021-06-11 10:33:00 +01:00
21fc386317
Move over to new lexicographic string sorting
2021-06-10 11:40:10 +01:00
fdda534053
Merge branch 'develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-09 19:23:14 +02:00
6e0a908c59
Merge branch 'develop' into gsouquet/react-17
2021-06-09 12:01:35 +01:00
d492ee4d8a
Update Enzyme adapter name
2021-06-09 11:57:29 +01:00
8334a2ba60
Merge pull request #6143 from robintown/hide-events-perf
2021-06-09 09:13:56 +01:00
692200b9c5
Merge pull request #6145 from matrix-org/dependabot/npm_and_yarn/test/end-to-end-tests/ws-6.2.2
...
Bump ws from 6.2.1 to 6.2.2 in /test/end-to-end-tests
2021-06-08 14:08:24 -06:00
bf77a4a2ab
Merge remote-tracking branch 'upstream/develop' into show-username
2021-06-08 17:14:42 +02:00
432373a00e
Merge pull request #5999 from robintown/improved-forwarding-ui
2021-06-08 10:52:06 +01:00
b97867271b
Merge branch 'develop' into improved-forwarding-ui
2021-06-07 19:09:36 -04:00
9fdbd4c120
Merge branch 'develop' into share-room
2021-06-07 17:00:44 -05:00
773af6c7be
Fix test
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-06-07 16:54:53 -05:00
025148d9fc
Merge branch 'develop' into show-username
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 19:37:22 +02:00
e891d18fa2
Add my email to my copyright notices
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 21:41:28 -04:00
a06306d560
Merge branch 'develop' into improved-forwarding-ui
2021-06-05 11:04:17 -04:00
0f64f4d692
Fix MessagePanel tests
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 10:49:44 -04:00
c24b239478
Bump ws from 6.2.1 to 6.2.2 in /test/end-to-end-tests
...
Bumps [ws](https://github.com/websockets/ws ) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/websockets/ws/releases )
- [Commits](https://github.com/websockets/ws/commits )
---
updated-dependencies:
- dependency-name: ws
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-06-05 13:36:25 +00:00
31604c13c0
Lint the typescript tests
...
Turns out we hadn't told eslint to lint .ts in tests/
Also fix all the lint errors, including removing a use of assert that
had randomly crept in.
2021-06-04 16:52:50 +01:00
8c533c7f8b
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
2021-06-04 08:09:31 +02:00
12e013508d
Merge pull request #6132 from matrix-org/travis/ts-mtxcli
...
Adapt for js-sdk MatrixClient conversion to TS
2021-06-04 00:07:22 -06:00
6eb33ac730
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-04 07:49:05 +02:00
7421efe8f9
Merge pull request #6136 from matrix-org/dbkr/map_phone_number_lookup_to_native
...
Map phone number lookup results to their native rooms
2021-06-03 19:01:46 +01:00
8ef95a6237
Interface dispatcher payload
...
& use constant in test
2021-06-03 14:38:13 +01:00
7f83590846
Merge pull request #6079 from matrix-org/gsouquet/switch-rooms
2021-06-03 08:44:01 +01:00
1c92e31683
Add missing license header
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-02 19:27:57 +02:00
e0572acb14
Write tests for CallEventGrouper
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-02 19:22:22 +02:00
2c4fa73a45
Map phone number lookup results to their native rooms
...
When dialing a phone number, also look to see if there's a corresponding
native user for the resulting user, and if so, go to the native room
for that user.
2021-06-02 17:39:13 +01:00
da13ec16f3
Merge branch 't3chguy/fix/17529' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282
2021-06-02 12:42:55 +01:00
d7a5547d80
use Intl.Collator over String.prototype.localeCompare for better performance
2021-06-02 10:42:17 +01:00
5b2dacd99e
Adapt for js-sdk MatrixClient conversion to TS
...
For https://github.com/matrix-org/matrix-js-sdk/pull/1718
2021-06-01 21:36:28 -06:00
992861a1cd
Fix forward dialog tests
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-01 20:36:28 -04:00
56714525f2
Merge branch 'develop' into improved-forwarding-ui
2021-06-01 17:28:55 -04:00
0b7d3f007a
Remove react-beautiful-dnd
2021-06-01 17:35:31 +01:00
f11a7083ae
Switch to stable endpoint/fields for MSC2858
2021-06-01 11:01:09 +01:00
c7c6a818f0
Merge branch 'develop' into gsouquet/switch-rooms
2021-05-26 09:51:27 +01:00
121ed5eba9
Pass Matrix client around as matrixClient
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-24 08:51:04 -04:00
400917623c
Make myself the copyright holder for forward dialog code
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-24 08:33:28 -04:00
7a04502151
Iterate on forward dialog design feedback
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-21 12:41:29 -04:00
c428736191
Update MessagePanel test to account for new DOM structure
2021-05-21 14:59:26 +01:00
678b298bab
Merge branch 'develop' into improved-forwarding-ui
2021-05-19 12:39:48 -04:00
aa4984019c
Merge pull request #6061 from jaiwanth-v/update-memberlist-invite
...
Update MemberList to reflect changes for invite permission change
2021-05-19 17:35:58 +01:00
a9d0699488
Merge pull request #6062 from matrix-org/t3chguy/fix/17280
...
Show DMs in space for invited members too, to match Android impl
2021-05-19 12:41:46 +01:00
88d3706c04
mock getMembers on mkStubRoom
2021-05-19 12:34:27 +01:00
506a798961
Add getMember mock
2021-05-19 15:19:56 +05:30
f7d0afcd28
Performance monitoring measurements ( #6041 )
2021-05-19 10:07:02 +01:00
454df8947b
Add mock for new client method
2021-05-18 13:46:47 +01:00
Michael Telatynski