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

Fix browser entrypoint #3051

Merged
merged 1 commit into from
Jan 11, 2023
Merged

Fix browser entrypoint #3051

merged 1 commit into from
Jan 11, 2023

Conversation

t3chguy
Copy link
Member

@t3chguy t3chguy commented Jan 11, 2023

Fixes #3013


Here's what your changelog entry will look like:

🐛 Bug Fixes

@t3chguy t3chguy added the backport staging Label to automatically backport PR to staging branch label Jan 11, 2023
@t3chguy t3chguy requested a review from a team as a code owner January 11, 2023 14:03
@t3chguy t3chguy requested a review from andybalaam January 11, 2023 14:03
@t3chguy t3chguy merged commit d7bf0f8 into develop Jan 11, 2023
@t3chguy t3chguy deleted the t3chguy-patch-1 branch January 11, 2023 15:17
@RiotRobot
Copy link
Contributor

The backport to staging failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-staging staging
# Navigate to the new working tree
cd .worktrees/backport-staging
# Create a new branch
git switch --create backport-3051-to-staging
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d7bf0f85c0f26b9b273dec5b6dbc2465eeb0e0eb
# Push it to GitHub
git push --set-upstream origin backport-3051-to-staging
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-staging

Then, create a pull request where the base branch is staging and the compare/head branch is backport-3051-to-staging.

t3chguy added a commit that referenced this pull request Jan 11, 2023
su-ex added a commit to SchildiChat/matrix-js-sdk that referenced this pull request Jan 19, 2023
* Remove extensible events v1 field population on legacy events ([\matrix-org#3040](matrix-org#3040)).
* Improve hasUserReadEvent and getUserReadUpTo realibility with threads ([\matrix-org#3031](matrix-org#3031)). Fixes element-hq/element-web#24164.
* Remove video track when muting video ([\matrix-org#3028](matrix-org#3028)). Fixes element-hq/element-call#209.
* Make poll start event type available (PSG-962) ([\matrix-org#3034](matrix-org#3034)).
* Add alt event type matching in Relations model ([\matrix-org#3018](matrix-org#3018)).
* Remove usage of v1 Identity Server API ([\matrix-org#3003](matrix-org#3003)).
* Add `device_id` to `/account/whoami` types ([\matrix-org#3005](matrix-org#3005)).
* Implement MSC3912: Relation-based redactions ([\matrix-org#2954](matrix-org#2954)).
* Introduce a mechanism for using the rust-crypto-sdk ([\matrix-org#2969](matrix-org#2969)).
* Support MSC3391: Account data deletion ([\matrix-org#2967](matrix-org#2967)).
* Fix threaded cache receipt when event holds multiple receipts ([\matrix-org#3026](matrix-org#3026)).
* Fix false key requests after verifying new device ([\matrix-org#3029](matrix-org#3029)). Fixes element-hq/element-web#24167 and element-hq/element-web#23333.
* Avoid triggering decryption errors when decrypting redacted events ([\matrix-org#3004](matrix-org#3004)). Fixes element-hq/element-web#24084.
* bugfix: upload OTKs in sliding sync mode ([\matrix-org#3008](matrix-org#3008)).
* Apply edits discovered from sync after thread is initialised ([\matrix-org#3002](matrix-org#3002)). Fixes element-hq/element-web#23921.
* Sliding sync: Fix issue where no unsubs are sent when switching rooms ([\matrix-org#2991](matrix-org#2991)).
* Threads are missing from the timeline ([\matrix-org#2996](matrix-org#2996)). Fixes element-hq/element-web#24036.
* Close all streams when a call ends ([\matrix-org#2992](matrix-org#2992)). Fixes element-hq/element-call#742.
* Resume to-device message queue after resumed sync ([\matrix-org#2920](matrix-org#2920)). Fixes matrix-org/element-web-rageshakes#17170.
* Fix browser entrypoint ([\matrix-org#3051](matrix-org#3051)). Fixes matrix-org#3013.
* Fix failure to start in firefox private browser ([\matrix-org#3058](matrix-org#3058)). Fixes element-hq/element-web#24216.
* Correctly handle limited sync responses by resetting the thread timeline ([\matrix-org#3056](matrix-org#3056)). Fixes element-hq/element-web#23952.
su-ex added a commit to SchildiChat/matrix-js-sdk that referenced this pull request Feb 1, 2023
* Implement decryption via the rust sdk ([\matrix-org#3074](matrix-org#3074)).
* Handle edits which are bundled with an event, per MSC3925 ([\matrix-org#3045](matrix-org#3045)).
* Add null check for our own member event ([\matrix-org#3082](matrix-org#3082)).
* Handle group call getting initialised twice in quick succession ([\matrix-org#3078](matrix-org#3078)). Fixes element-hq/element-call#847.
* Correctly handle limited sync responses by resetting the thread timeline ([\matrix-org#3056](matrix-org#3056)). Fixes element-hq/element-web#23952. Contributed by @justjanne.
* Fix failure to start in firefox private browser ([\matrix-org#3058](matrix-org#3058)). Fixes element-hq/element-web#24216.
* Fix spurious "Decryption key withheld" messages ([\matrix-org#3061](matrix-org#3061)). Fixes element-hq/element-web#23803.
* Fix browser entrypoint ([\matrix-org#3051](matrix-org#3051)). Fixes matrix-org#3013.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport staging Label to automatically backport PR to staging branch T-Defect X-Release-Blocker
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Failed to resolve entry for package "matrix-js-sdk"
3 participants