Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop into group call branch again #2513

Merged
merged 28 commits into from
Jul 12, 2022

Conversation

dbkr
Copy link
Member

@dbkr dbkr commented Jul 12, 2022


This change is marked as an internal change (Task), so will not be included in the changelog.

SimonBrandner and others added 27 commits June 26, 2022 08:43
* renamed:    spec/unit/crypto/crypto-utils.js -> spec/unit/crypto/crypto-utils.ts

* ts fixes in crypto-utils

* renamed:    spec/unit/crypto/backup.spec.js -> spec/unit/crypto/backup.spec.ts

* ts fixes in backup.spec

* remove fit

* remove debug
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Regressed by #2352
(you can just use RTCStatsReport as an iterator directly (which
was was what that code was doing before) which uses entries(
which gives you key/value pairs, but using forEach gives you just
the value.
Older typescript library doesn't know about .values() on the stats
object, so it was failing in react sdk which had an older typescript.
matrix-org/matrix-react-sdk#8935 was an
attempt to upgrade it but did not seem to be helping on CI, despite
being fine locally.
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…ion (#2503)

* Actually store the identity server in the client when given as an option

* Update requestRegisterEmailToken to a modern spec version too
…ync (#2505)

Events returned by the `/sync` endpoint, including relations bundled with other events, may have their `room_id`s stripped out. This causes decryption errors if the IDs aren't repopulated.

Fixes element-hq/element-web#22094.
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
It'll be mildly annoying for core developers who have to constantly remove or edit this, but it'll also serve as a good reminder to do these things.

Note that signoff is not required for core developers.
@dbkr dbkr changed the base branch from develop to robertlong/group-call July 12, 2022 11:12
@dbkr dbkr added the T-Task Tasks for the team like planning label Jul 12, 2022
@dbkr dbkr marked this pull request as ready for review July 12, 2022 17:09
@dbkr dbkr requested a review from a team as a code owner July 12, 2022 17:09
Copy link
Member

@robintown robintown left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like a merge commit

@dbkr dbkr merged commit 544b1c6 into robertlong/group-call Jul 12, 2022
@dbkr dbkr deleted the dbkr/groupcallmerge2 branch July 12, 2022 18:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
T-Task Tasks for the team like planning
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants