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

Support cancelling events whilst they are in status = ENCRYPTING #2095

Merged
merged 6 commits into from
Jan 11, 2022

Conversation

t3chguy
Copy link
Member

@t3chguy t3chguy commented Jan 7, 2022


Here's what your changelog entry will look like:

✨ Features

  • Support cancelling events whilst they are in status = ENCRYPTING (#2095).

@t3chguy t3chguy marked this pull request as ready for review January 10, 2022 12:03
@t3chguy t3chguy requested a review from a team as a code owner January 10, 2022 12:03
…chguy/fix/17726

� Conflicts:
�	spec/unit/matrix-client.spec.js
@t3chguy t3chguy merged commit 2d9c938 into develop Jan 11, 2022
@t3chguy t3chguy deleted the t3chguy/fix/17726 branch January 11, 2022 15:03
su-ex added a commit to SchildiChat/matrix-js-sdk that referenced this pull request Jan 31, 2022
* Support m.asset in m.location event content ([\matrix-org#2109](matrix-org#2109)).
* Send extensible events structure and support on-demand parsing ([\matrix-org#2091](matrix-org#2091)).
* Support cancelling events whilst they are in status = ENCRYPTING ([\matrix-org#2095](matrix-org#2095)).
* Fix http-api butchering idServer requests ([\matrix-org#2134](matrix-org#2134)). Fixes element-hq/element-web#20680.
* Don't remove streams that still have tracks ([\matrix-org#2104](matrix-org#2104)).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants