Skip to content

Update to upstream v1.141 #5

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.

Sign up for GitHub

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

Jump to bottom
Merged
jason-famedly merged 11 commits into from
Nov 18, 2025
Merged

Update to upstream v1.141 #5

jason-famedly merged 11 commits into from
Nov 18, 2025

Conversation

@jason-famedly
Copy link
Collaborator

@jason-famedly jason-famedly commented Nov 17, 2025

No description provided.

MadLittleMods and others added 11 commits September 22, 2025 10:15
@MadLittleMods
Use FQDN helper on m.room.server_acl events (matrix-org#804)
89b911f 
Follow-up to matrix-org#780
@anoadragon453
Verify that ephemeral events down /sync don't have a room_id field (
091cbf5 
matrix-org#807)
@kegsay @MadLittleMods
Lock /createRoom calls (matrix-org#800)
10fee65 
* Lock /createRoom calls

To reduce the chance of multiple rooms being made in the same
millisecond which makes v12 rooms unhappy as it causes the same
room ID to be generated.

* Update client/client.go

Co-authored-by: Eric Eastwood <erice@element.io>

---------

Co-authored-by: Eric Eastwood <erice@element.io>
@anoadragon453
Add require signatures field to /keys/upload call (matrix-org#805)
40d5005
@anoadragon453
Add require signatures field to /keys/upload call (matrix-org#805)
e9a6b3b
@anoadragon453
Add require signatures field to /keys/upload call (matrix-org#805)
9951693
@anoadragon453
Merge branch 'release-v1.139'
1a0ba4e
@anoadragon453
Merge branch 'release-v1.138'
057fc56
@chrislearn
Ignore error for send B before A in TestUnrejectRejectedEvents test (m…
3752f0c 
…atrix-org#809)
@anoadragon453
Exclude .devenv directory from .gitignore (matrix-org#810)
0de5285
@jason-famedly
Merge branch 'release-v1.141' into famedly-release/v1.141
071d7d8
@CLAassistant
Copy link

CLAassistant commented Nov 17, 2025

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
0 out of 4 committers have signed the CLA.

❌ MadLittleMods
❌ anoadragon453
❌ kegsay
❌ chrislearn
You have signed the CLA already but the status is still pending? Let us recheck it.

@jason-famedly jason-famedly merged commit 46fa9f0 into main Nov 18, 2025
3 of 4 checks passed
@jason-famedly jason-famedly deleted the famedly-release/v1.141 branch November 18, 2025 13:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@FrenchGithubUser FrenchGithubUser FrenchGithubUser approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@jason-famedly @CLAassistant @FrenchGithubUser @MadLittleMods @anoadragon453 @kegsay @chrislearn