Šimon Brandner
07f49bcc37
Merge branch 'develop' into feed
2021-04-13 12:33:23 +02:00
J. Ryan Stinnett
09fac77ce0
Merge pull request #1642 from matrix-org/jryans/rework-linting
...
Migrate to `eslint-plugin-matrix-org`
2021-04-13 11:12:39 +01:00
J. Ryan Stinnett
102704e91a
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-04-13 11:00:41 +01:00
Michael Telatynski
c5fb351baa
Merge pull request #1664 from matrix-org/t3chguy/fix/8665
...
Add missing event type enum for key verification done
2021-04-13 10:05:00 +01:00
Michael Telatynski
98f8d4414d
Add missing event type enum for key verification done
2021-04-13 09:41:53 +01:00
Germain
1dddcd4925
Merge pull request #1663 from matrix-org/gsouquet-timeline-jumpiness
2021-04-12 15:00:49 +01:00
Germain Souquet
2666a271a5
fix tests when pendingEventsList does not exist
2021-04-12 14:51:45 +01:00
RiotRobot
e277de6e3d
Resetting package fields for development
2021-04-12 14:42:29 +01:00
RiotRobot
daa17b3287
Merge branch 'master' into develop
2021-04-12 14:42:29 +01:00
RiotRobot
c7f887131e
v9.11.0
2021-04-12 14:39:33 +01:00
RiotRobot
58546b80d0
Prepare changelog for v9.11.0
2021-04-12 14:39:32 +01:00
Germain Souquet
466f749b71
fix typo
2021-04-12 14:38:27 +01:00
Germain Souquet
4c2a83c470
Add explanation for events persistence
2021-04-12 14:29:10 +01:00
Germain Souquet
d534ab18c7
fix event filtering logic
2021-04-12 13:07:57 +01:00
Germain Souquet
64aaed833b
Only persist encrypted events for encrypted rooms
2021-04-12 12:53:27 +01:00
Germain Souquet
2f05be599c
undo changes to event#toJSON and persist encrypted events
2021-04-12 12:26:27 +01:00
Germain Souquet
7371f8dd3a
Persist txnId to ensure idempotency
2021-04-12 09:55:01 +01:00
Germain Souquet
79aefe9707
Fix timeline jumpiness by setting correct txnId
2021-04-12 09:37:19 +01:00
Michael Telatynski
6bc80577ee
Merge pull request #1661 from janpawellek/janpawellek-fix-addEventListener
...
Fix calling addEventListener if it does not exist
2021-04-12 09:15:19 +01:00
Germain
837764190f
Merge pull request #1655 from matrix-org/gsouquet-persist-unsent-messages
2021-04-09 17:48:01 +01:00
Germain Souquet
61948d70e3
Merge branch 'develop' into gsouquet-persist-unsent-messages
2021-04-09 17:05:19 +01:00
Jan Pawellek
9fb0385694
Fix calling addEventListener if it does not exist
...
Some platforms (e.g. React Native) register global.window, but do not have global.window.addEventListener. In this case, this function should not be called.
2021-04-09 10:18:47 +02:00
Šimon Brandner
193de8d3a9
Merge branch 'feed' of https://github.com/SimonBrandner/matrix-js-sdk into feed
2021-04-08 11:15:07 +02:00
Šimon Brandner
1f2b3512c1
Move SDPStreamMetadataPurpose into callEventTypes.ts
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-04-08 11:14:42 +02:00
Šimon Brandner
ddc5bd3b36
Add prefixes to SDPStreamMetadataPurpose
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-04-08 11:07:53 +02:00
Šimon Brandner
ee828d454a
Rename CallFeedPurpose to SDPStreamMetadataPurpose
...
This is to match MSC3077
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-04-08 11:07:22 +02:00
Šimon Brandner
2916a73f4c
Make selectDesktopCapturerSource optional
2021-04-08 11:01:17 +02:00
Šimon Brandner
ae69af7e70
Merge branch 'develop' into feed
2021-04-07 19:14:17 +02:00
RiotRobot
1c6459fe65
v9.11.0-rc.1
2021-04-07 12:55:25 +01:00
RiotRobot
adaeb42416
Prepare changelog for v9.11.0-rc.1
2021-04-07 12:55:24 +01:00
J. Ryan Stinnett
f1e1daa194
Merge pull request #1657 from matrix-org/jryans/cs-keys-test
...
Only try to cache private keys we know exist
2021-04-06 10:09:04 +01:00
J. Ryan Stinnett
401e89ef78
Only try to cache private keys we know exist
...
This tweaks https://github.com/matrix-org/matrix-js-sdk/pull/1649 to only try
caching private keys locally once we've confirmed they exist first. This is most
likely only an issue in tests, where we sometimes create only some but not all
keys.
2021-04-06 09:49:20 +01:00
Travis Ralston
59e0bd467c
Merge pull request #1654 from SimonBrandner/terminate-screen-share
...
Properly terminate screen-share calls if NoUserMedia
2021-04-05 10:55:02 -06:00
Šimon Brandner
7f4397f8ca
Use getAudioTracks() and getVideoTracks()
...
This is much nicer. Before I hadn't realized this was possible
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-04-05 10:31:27 +02:00
Šimon Brandner
32830b93f1
Rename audioOnly to videoMuted
...
This makes more sense and will match a possible mute events MSC
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-04-04 08:50:27 +02:00
Šimon Brandner
cdc0d5623b
Rename to match MSC3077
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-04-04 08:37:09 +02:00
Šimon Brandner
e78b415832
Add getMember() to CallFeed
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-04-04 08:33:51 +02:00
Šimon Brandner
ff1379fd29
Merge branch 'develop' into feed
2021-04-03 08:35:05 +02:00
David Baker
3820c15ecf
Merge pull request #1652 from matrix-org/dbkr/attended_transfer
...
Attended transfer
2021-04-01 17:34:18 +01:00
Germain Souquet
26ef33e4f3
No this assign
2021-04-01 17:29:21 +01:00
Germain Souquet
0534a4ed1b
prevent removePendingEvent being called when not in detached mode
2021-04-01 17:23:55 +01:00
Germain Souquet
f29a24a915
specify TestClient when testing room model
2021-04-01 15:22:13 +01:00
Germain Souquet
cecbcd941e
Persist unsent messages for subsequent sessions
2021-04-01 10:59:16 +01:00
David Baker
6be99d6397
Terminate the other call too
2021-03-30 12:13:28 +01:00
J. Ryan Stinnett
4e5947af51
Merge pull request #1653 from matrix-org/jryans/cancel-security-key
...
Remove catch handlers in private key retrieval
2021-03-29 17:58:07 +01:00
RiotRobot
4204b2170a
Resetting package fields for development
2021-03-29 13:28:09 +01:00
RiotRobot
0a5ad489b6
Merge branch 'master' into develop
2021-03-29 13:28:08 +01:00
RiotRobot
5de34a5c99
v9.10.0
2021-03-29 13:25:27 +01:00
RiotRobot
08da6b8800
Prepare changelog for v9.10.0
2021-03-29 13:25:27 +01:00
Šimon Brandner
02b283be78
Properly terminate screenshare calls if NoUserMedia
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-03-27 09:13:44 +01:00
