Commit Graph

717 Commits (1f27049a5deb4c459fb5b19552d39bacb2822d9f)

Author SHA1 Message Date
Š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
Michael Telatynski 59052b1eb7
Merge pull request #6199 from matrix-org/t3chguy/fix/17665 2021-06-22 17:46:57 +01:00
Michael Telatynski 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
Michael Telatynski 8a3dc1bbdf fix tests 2021-06-18 17:56:18 +01:00
Michael Telatynski 35e68b8aa5 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665 2021-06-17 15:45:32 +01:00
Michael Telatynski 017e0ba40f fix more private field accesses in tests 2021-06-17 15:23:29 +01:00
Germain 48e090abcc
Remove unnecessary comment 2021-06-17 10:20:43 +01:00
Michael Telatynski e7fde2686f remove unused imports 2021-06-16 12:12:00 +01:00
Germain Souquet 9f8d04ab9a Fix passing variable down to evaluate context 2021-06-16 11:39:04 +01:00
Michael Telatynski bceee7978e improve naming of tests 2021-06-16 09:30:47 +01:00
Michael Telatynski 9e20e5dfc4 mock new settings in tests 2021-06-16 09:14:07 +01:00
Germain Souquet 19cae42161 Benchmark multiple common user scenario 2021-06-15 15:06:00 +01:00
Germain Souquet 7310d35d7f Merge branch 'develop' into gsouquet/benchmark-tracking 2021-06-15 11:45:11 +01:00
Michael Telatynski a63d9220d2 Clear outstanding TODOs 2021-06-15 08:26:46 +01:00
Michael Telatynski 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
Michael Telatynski 91df392a2a
Merge pull request #5880 from SimonBrandner/show-username 2021-06-14 21:34:01 +01:00
Michael Telatynski 2879b9086c Use alphabet from js-sdk 2021-06-14 21:32:11 +01:00
Michael Telatynski 8fd72fcf79 Iterate algorithm, base it on new js-sdk string lib 2021-06-14 21:28:32 +01:00
Germain Souquet 7000176572 Add workflow steps to track measurements 2021-06-14 14:53:22 +01:00
Michael Telatynski 4af2675e23 stash bigint support 2021-06-14 14:37:05 +01:00
Aaron Raimist b8458c0ae3
fix test maybe
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-06-11 23:58:20 -05:00
Michael Telatynski 3d4411390f write a shedload more tests 2021-06-11 16:28:07 +01:00
Germain Souquet 37484e3fc4 Add TextEncoder polyfill for test run 2021-06-11 12:33:02 +01:00
Michael Telatynski a4fa2779d4 Iterate lexicographic ordering implementation 2021-06-11 10:33:00 +01:00
Michael Telatynski 21fc386317 Move over to new lexicographic string sorting 2021-06-10 11:40:10 +01:00
Germain Souquet 6e0a908c59 Merge branch 'develop' into gsouquet/react-17 2021-06-09 12:01:35 +01:00
Germain Souquet d492ee4d8a Update Enzyme adapter name 2021-06-09 11:57:29 +01:00
Germain 8334a2ba60
Merge pull request #6143 from robintown/hide-events-perf 2021-06-09 09:13:56 +01:00
Travis Ralston 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
Šimon Brandner bf77a4a2ab
Merge remote-tracking branch 'upstream/develop' into show-username 2021-06-08 17:14:42 +02:00
Michael Telatynski 432373a00e
Merge pull request #5999 from robintown/improved-forwarding-ui 2021-06-08 10:52:06 +01:00
Robin Townsend b97867271b Merge branch 'develop' into improved-forwarding-ui 2021-06-07 19:09:36 -04:00
Aaron Raimist 9fdbd4c120 Merge branch 'develop' into share-room 2021-06-07 17:00:44 -05:00
Aaron Raimist 773af6c7be
Fix test
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-06-07 16:54:53 -05:00
Šimon Brandner 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
Robin Townsend e891d18fa2 Add my email to my copyright notices
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 21:41:28 -04:00
Robin Townsend a06306d560 Merge branch 'develop' into improved-forwarding-ui 2021-06-05 11:04:17 -04:00
Robin Townsend 0f64f4d692 Fix MessagePanel tests
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 10:49:44 -04:00
dependabot[bot] 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
David Baker 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
Travis Ralston 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
David Baker 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
David Baker 8ef95a6237 Interface dispatcher payload
& use constant in test
2021-06-03 14:38:13 +01:00
Germain 7f83590846
Merge pull request #6079 from matrix-org/gsouquet/switch-rooms 2021-06-03 08:44:01 +01:00
David Baker 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
Michael Telatynski 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
Germain Souquet d7a5547d80 use Intl.Collator over String.prototype.localeCompare for better performance 2021-06-02 10:42:17 +01:00
Travis Ralston 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