Dima/matrix-js-sdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,827 Commits 1 Branch 533 Tags
4f48554cd257816cd40ed35bbdc4d0be3d2ff4e4
Commit Graph

6827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baker 4f48554cd2 Merge pull request #1861 from matrix-org/dbkr/release_script_handle_no_signing_id_rel 
Fix release script to handle no signing ID
 2021-08-17 09:13:59 +01:00
David Baker 66b4279dd8 Fix release script to handle no signing ID 
We now use the file for stuff other than just the signing ID, so
the file may be present but with no signing ID: handle this case.
 2021-08-17 09:10:11 +01:00
David Baker 290575ba65 Merge pull request #1858 from SimonBrandner/fix/voip 
Fix broken voice calls, no ringing and broken call notifications
 2021-08-17 08:54:11 +01:00
Šimon Brandner bd8690de57 Fix regressions 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-17 08:09:14 +02:00
Šimon Brandner 0d09f87777 Revert "Revert "Fix glare related regressions"" 
This reverts commit 4c552cc350.
 2021-08-17 07:33:40 +02:00
David Baker 0f45b7e516 Merge pull request #1857 from matrix-org/revert-1851-fix/glare/18538 
Revert "Fix glare related regressions"
 2021-08-16 23:18:13 +01:00
David Baker 4c552cc350 Revert "Fix glare related regressions" 2021-08-16 23:06:57 +01:00
David Baker 6a87f54292 Merge pull request #1856 from matrix-org/dbkr/release_script_handle_no_signing_id 
Fix release script to handle no signing ID
 2021-08-16 15:32:09 +01:00
David Baker bfb2c5aad0 Fix release script to handle no signing ID 
We now use the file for stuff other than just the signing ID, so
the file may be present but with no signing ID: handle this case.
 2021-08-16 14:38:42 +01:00
RiotRobot db898e7bcf Resetting package fields for development 2021-08-16 13:55:37 +01:00
RiotRobot dbebbe3a19 Merge branch 'master' into develop 2021-08-16 13:55:37 +01:00
RiotRobot 10e8aff46a v12.3.0 v12.3.0 2021-08-16 13:52:36 +01:00
RiotRobot 81e2ea6a61 Prepare changelog for v12.3.0 2021-08-16 13:52:35 +01:00
David Baker 2594c59250 Merge pull request #1855 from matrix-org/dbkr/update_allchange 
Update changelog generator
 2021-08-16 13:31:28 +01:00
David Baker b56a4ee6ec Fix dates 2021-08-16 13:24:11 +01:00
David Baker ab524ad3b4 Update changelog generator 2021-08-16 13:18:06 +01:00
David Baker 83bf80feec Merge pull request #1854 from SimonBrandner/release/fix/glare/18538 
[Release] Fix glare related regressions
 2021-08-16 12:40:08 +01:00
Šimon Brandner b9e5417218 Await handleCallEvent() 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-16 13:30:22 +02:00
Šimon Brandner 082169a756 Fix glare 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-16 13:30:21 +02:00
Šimon Brandner cdc87d371c Reformat some code 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-16 13:30:21 +02:00
Šimon Brandner f8ec3bc591 Remove weird method call 
If we can get localUsermediaStream gotUserMediaForAnswer() has alredy been called before

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-16 13:30:21 +02:00
Šimon Brandner 85f4651e9b Simplifie some code 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-16 13:30:20 +02:00
Šimon Brandner da53241c48 Remove unnecessary logs 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-16 13:30:20 +02:00
Šimon Brandner fa265296e8 Add a comment 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-16 13:30:19 +02:00
David Baker ccf296ea92 Merge pull request #1851 from SimonBrandner/fix/glare/18538 
Fix glare related regressions
 2021-08-16 12:27:51 +01:00
Šimon Brandner d65b48204b Await handleCallEvent() 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-16 13:14:04 +02:00
J. Ryan Stinnett 977720cee4 Merge pull request #1852 from matrix-org/jryans/comment-to-json 
Clarify usages of event's toJSON
 2021-08-16 10:30:50 +01:00
J. Ryan Stinnett 0b12e37459 Clarify usages of event's toJSON 2021-08-16 09:04:14 +01:00
Šimon Brandner 51e815f0cb Fix glare 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-15 13:03:18 +02:00
Šimon Brandner f3856d569d Reformat some code 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-15 13:03:08 +02:00
Šimon Brandner e6d1909f0b Remove weird method call 
If we can get localUsermediaStream gotUserMediaForAnswer() has alredy been called before

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-15 13:02:39 +02:00
Šimon Brandner 408976a199 Simplifie some code 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-15 12:58:38 +02:00
Šimon Brandner 4da49d926b Remove unnecessary logs 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-15 12:57:27 +02:00
Šimon Brandner 75750ed760 Add a comment 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-15 12:56:48 +02:00
Travis Ralston 2f74779bf1 Merge pull request #1772 from matrix-org/t3chguy/ts/12 
Convert SearchResult, InteractiveAuth, PushProcessor and Scheduler to TS
 2021-08-13 10:08:54 -06:00
Michael Telatynski 7b038393b1 Merge pull request #1792 from matrix-org/t3chguy/kill-groups 
Deprecate groups APIs
 2021-08-13 16:39:47 +01:00
Dariusz Niemczyk 78118e9442 Merge pull request #1846 from matrix-org/jaller94-patch-1 
SSSSCryptoCallbacks.getSecretStorageKey return Promise<null> if no key was found
 2021-08-13 15:36:53 +02:00
Christian Paul 7c4f7c9dad SSSSCryptoCallbacks.getSecretStorageKey: Return null, if no key found 2021-08-13 15:23:47 +02:00
Christian Paul 62058e6d48 SSSSCryptoCallbacks.getSecretStorageKey may return Promise<void> 
If no result is found, the function may reach the last line without `return` ever being called.
 2021-08-13 15:15:20 +02:00
Dariusz Niemczyk a2f514b544 Merge pull request #1834 from matrix-org/palid/fix/signaling-state-errors 
Fix temporary call messages being handled without call
 2021-08-13 14:17:30 +02:00
RiotRobot 67434bc5d4 v12.3.0-rc.2 v12.3.0-rc.2 2021-08-12 15:11:35 +01:00
RiotRobot 167183775e Prepare changelog for v12.3.0-rc.2 2021-08-12 15:11:35 +01:00
David Baker 4ce6313126 Merge pull request #1840 from matrix-org/dbkr/allchange_npm 
Use changelog generator from npm
 2021-08-12 15:02:12 +01:00
David Baker 1298ed61b6 Merge pull request #1842 from matrix-org/dbkr/fix_types_build 
Fix the types in shipped package
 2021-08-12 14:33:01 +01:00
David Baker 2bc1f2fe21 Apparently target matters when not emitting 2021-08-12 11:54:19 +01:00
David Baker b392dbf6f8 Fix the types building 
1829 added the spec files to 'src', presumably because they just
were't type checked otherwise, but this chaqnged the implicit rootDir
so the lib directory we shipped has types in src/ and spec/ which
meant lib/index.d.ts was at lib/src/index.d.ts.

Specify the rootDir on the build tsconfig to put it back in the
right place, and also try to make the base tsconfig never emit
to avoid it ever generating .d.ts files in silly places. Move all
the optoins related to emitting to -build since they aren't relevant
in the main one.

Is this a sensible way to do this? It doesn't feel terribly elegant.

Fixes https://github.com/vector-im/element-web/issues/18503
Regressed in https://github.com/matrix-org/matrix-js-sdk/pull/1829
 2021-08-12 11:46:49 +01:00
Travis Ralston 696b3ef1ce Merge pull request #1841 from matrix-org/travis/fsdk/fix-delete 
Fix conditional on returning file tree spaces
 2021-08-11 15:21:20 -06:00
Travis Ralston 4e2ee3b3a8 It helps to fix the other tests too 2021-08-11 15:18:24 -06:00
Travis Ralston 1f9fab9a0c Fix conditional on returning file tree spaces 
If a tree space was deleted then it'll still hold a Room object for us, which is not much help if we're effectively trying to get the joined trees.
 2021-08-11 15:11:13 -06:00
David Baker 6170796ed8 Use changelog generator from npm 2021-08-11 21:50:13 +01:00