Eric Eastwood
2bd60f4160
Merge pull request #1933 from matrix-org/madlittlemods/more-better-pr-descriptions
...
Update PR guidelines for easier review
2021-09-17 11:54:13 -05:00
David Baker
e71362a6df
Merge pull request #1936 from matrix-org/dbkr/await_save_backup_key
...
Fix race on automatic backup restore
2021-09-17 17:06:43 +01:00
David Baker
673c09cd77
Fix race on automatic backup restore
...
We forgot to await the saving of the backup key, so there was a race
where it would fail to get the backup key because it hadn't been saved
yet, so the backup wouldn't be restored automatically.
Fixes https://github.com/vector-im/element-web/issues/17781
2021-09-17 15:53:14 +01:00
Dariusz Niemczyk
4bc8f968e0
Merge pull request #1932 from matrix-org/palid/threads-typescriptify
...
Fix PR comments
2021-09-17 08:11:36 +02:00
Eric Eastwood
3705426b6d
Make PR's easier to review
2021-09-16 16:05:49 -05:00
Dariusz Niemczyk
5813aea27f
Properly rename ThreadEvents to ThreadEvent
2021-09-16 17:49:31 +02:00
Dariusz Niemczyk
5ba836a31b
Fix PR comments
2021-09-16 17:12:57 +02:00
Dariusz Niemczyk
4f387d15b9
Merge pull request #1930 from matrix-org/palid/threads-typescriptify
...
Typescriptify thread events a bit
2021-09-16 17:12:02 +02:00
Dariusz Niemczyk
8ab0246ca2
Fix PR comments
2021-09-16 16:03:47 +02:00
Dariusz Niemczyk
ed68bd4108
Typescriptify thread events a bit
2021-09-16 15:59:41 +02:00
Dariusz Niemczyk
3d39e8ec26
Merge pull request #1880 from matrix-org/palid/fix/dont-persist-log-level
...
Palid/fix/dont persist log level
2021-09-16 14:52:52 +02:00
Robert Long
53bdab7cc8
Merge pull request #1929 from matrix-org/robertlong/datachannels
...
Add WebRTC DataChannels to MatrixCall
2021-09-15 14:25:13 -07:00
Robert Long
fafa55ba1d
Merge pull request #1928 from matrix-org/robertlong/clone-streams
...
Clone and stop local media streams from mediaHandler
2021-09-15 14:25:00 -07:00
Travis Ralston
3a818c1419
Merge pull request #1927 from SimonBrandner/feature/getBuffer
...
Add `getBuffer()` to `QRCodeData`
2021-09-15 14:42:11 -06:00
Robert Long
422853298c
Reset media stream arrays
2021-09-15 13:20:52 -07:00
Robert Long
f3a2bd6b40
Clean up stopAllMedia
2021-09-15 12:38:12 -07:00
Robert Long
6834137f50
Add datachannels to MatrixCall
2021-09-15 12:28:09 -07:00
Robert Long
c4d7fef0cd
Clone and stop local media streams from mediaHandler
2021-09-15 12:08:28 -07:00
Šimon Brandner
556b5ff628
Add getBuffer() to QRCodeData
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-09-15 20:27:13 +02:00
David Baker
2daa1ec4ce
Merge pull request #1916 from matrix-org/dbkr/verify_key_share_tests
...
Tests for key sharing security fix
2021-09-15 18:38:03 +01:00
Travis Ralston
348ea72b70
Merge pull request #1925 from SimonBrandner/task/setCodecPreferences
...
Add `setCodecPreferences()` to `global.d.ts`
2021-09-15 09:48:27 -06:00
Šimon Brandner
4e14d810c5
Add setCodecPreferences()
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-09-15 17:44:16 +02:00
Travis Ralston
f84905b003
Merge pull request #1924 from SimonBrandner/revert-1923-task/die-rtx-hack
...
Revert "Remove RTX codec hack "
2021-09-15 09:23:27 -06:00
Šimon Brandner
9bb87145f6
Revert "Remove RTX codec hack "
2021-09-15 17:17:56 +02:00
Travis Ralston
c7675570aa
Merge pull request #1923 from SimonBrandner/task/die-rtx-hack
...
Remove RTX codec hack
2021-09-15 09:16:55 -06:00
Šimon Brandner
be942fd66a
Remove RTX codec hack as the issue is no longer present on Chromium 90
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-09-15 16:38:59 +02:00
James Salter
8544aca362
Merge pull request #1922 from matrix-org/revert-errors-ts
...
Revert "Migrate errors to TypeScript"
2021-09-15 12:08:32 +01:00
James Salter
c3308e1de9
Revert "Migrate errors to TypeScript"
...
This reverts commit ab906faa17 .
2021-09-15 12:01:34 +01:00
David Baker
047d7125a1
Merge pull request #1920 from matrix-org/dbkr/fix_autodiscovery_types
...
Fix types
2021-09-15 11:29:10 +01:00
David Baker
cf4d3117c1
Fix types
...
This is 'any' (defined as any by IWellKnownConfig.raw) rather than
string (which the jsdoc claimed). We were calling this method ourselves
but with an object that was also 'any', so it was fine, but react-sdk
calls it with an object literal, which typescript knows it not a string.
2021-09-15 10:29:14 +01:00
David Baker
88c2844e48
Merge pull request #1919 from matrix-org/dbkr/yarnupgrade_20210914
...
yarn upgrade
2021-09-15 10:01:18 +01:00
Germain
6ca4694fe6
Merge pull request #1907 from matrix-org/gsouquet/ts-last-push
2021-09-15 08:30:52 +01:00
Germain
062287e270
Merge pull request #1913 from matrix-org/gsouquet/ts-security
2021-09-15 08:27:29 +01:00
Germain Souquet
50e0d76f10
remove erroneous comment related to typings
2021-09-15 09:26:25 +02:00
Travis Ralston
df039d3d8c
Merge pull request #1911 from SimonBrandner/feature/media-handling
...
Improve `MatrixCall` media handling and internally remove `CallType`s
2021-09-14 14:40:45 -06:00
Travis Ralston
799606b73c
Merge pull request #1909 from matrix-org/travis/fsdk/locking
...
Add file locking to MSC3089 branches
2021-09-14 12:39:41 -06:00
Travis Ralston
c048f5d357
Merge pull request #1910 from matrix-org/travis/fsdk/tests
...
Add missing tests for MSC3089 implementation
2021-09-14 12:37:54 -06:00
Robert Long
f712a8cecb
Merge pull request #1903 from matrix-org/robertlong/fix-register-types
...
Add types for the MatrixClient register method
2021-09-14 10:56:12 -07:00
David Baker
e1d8d6bf4e
Not typescript again
...
because this time they just removed setCodecPreferences from webrtc?
2021-09-14 18:52:35 +01:00
Robert Long
14ed8a110c
Update src/client.ts
...
Co-authored-by: Travis Ralston <travisr@matrix.org >
2021-09-14 10:50:50 -07:00
David Baker
cb6700f21b
yarn upgrade
2021-09-14 18:41:14 +01:00
Travis Ralston
d4f35bf07a
fix main package?
2021-09-14 10:03:23 -06:00
RiotRobot
b4eb29138b
Resetting package fields for development
2021-09-14 15:52:38 +01:00
RiotRobot
8ca3a071f9
Merge branch 'master' into develop
2021-09-14 15:51:45 +01:00
RiotRobot
5abd211436
Merge branch 'release-v12.5.0'
2021-09-14 15:51:13 +01:00
RiotRobot
99f428e091
v12.5.0
v12.5.0
2021-09-14 15:46:09 +01:00
RiotRobot
a734fdf9b0
Prepare changelog for v12.5.0
2021-09-14 15:46:08 +01:00
David Baker
6f91b2bc80
Merge pull request #1917 from matrix-org/dbkr/verify_keyshare_tests_125rel
...
Tests for key sharing security fix
2021-09-14 15:33:05 +01:00
David Baker
32d7272939
Tests for key sharing security fix
...
Tests for 894c24880d
2021-09-14 15:24:15 +01:00
David Baker
c8d85452bf
Merge remote-tracking branch 'origin/develop' into dbkr/verify_key_share_tests
2021-09-14 15:16:49 +01:00