Skip to content

Release: merge 1.4.0 into development for BETA testing#469

Merged
cdils merged 10 commits intodevelopmentfrom
release_1.4.0
Apr 13, 2026
Merged

Release: merge 1.4.0 into development for BETA testing#469
cdils merged 10 commits intodevelopmentfrom
release_1.4.0

Conversation

@cdils
Copy link
Copy Markdown
Contributor

@cdils cdils commented Apr 9, 2026

No description provided.

johnbillion and others added 9 commits February 12, 2026 14:08
Signed-off-by: John Blackbourn <john@johnblackbourn.com>
Signed-off-by: Andy Fragen <andy@thefragens.com>
Signed-off-by: Carrie Dils <carriedils@gmail.com>
Signed-off-by: Norcross <andrew.norcross@gmail.com>
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: joedolson <joedolson@users.noreply.github.com>
Signed-off-by: Joe Dolson <design@joedolson.com>
Signed-off-by: Shadi Sharaf <shady@sharaf.me>
Co-authored-by: Chuck Adams <chaz@chaz.works>
Co-authored-by: Andy Fragen <andy@thefragens.com>
Co-authored-by: Norcross <andrew.norcross@gmail.com>
Co-authored-by: Carrie Dils <cdils@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: rmccue <21655+rmccue@users.noreply.github.com>
Co-authored-by: cdils <3099408+cdils@users.noreply.github.com>
Co-authored-by: joedolson <joedolson@users.noreply.github.com>
Co-authored-by: Joe Dolson <design@joedolson.com>
Co-authored-by: Shady Sharaf <shady@sharaf.me>
Signed-off-by: Chuck Adams <chaz@chaz.works>
Signed-off-by: Mika Ipstenu Epstein <ipstenu@halfelf.org>
Signed-off-by: Ipstenu (Mika Epstein) <Ipstenu@users.noreply.github.com>
Signed-off-by: Mika <ipstenu@halfelf.org>
Signed-off-by: Mika Ipstenu Epstein <ipstenu@halfelf.org>
Signed-off-by: Mika Epstein <ipstenu@halfelf.org>
Signed-off-by: Andy Fragen <andy@thefragens.com>
Signed-off-by: Marc Armengou <83702259+marcarmengou@users.noreply.github.com>
Co-authored-by: Carrie Dils <cdils@users.noreply.github.com>
Co-authored-by: Chuck Adams <chaz@chaz.works>
Signed-off-by: Marc Armengou <83702259+marcarmengou@users.noreply.github.com>
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Marc Armengou <83702259+marcarmengou@users.noreply.github.com>
Co-authored-by: cdils <3099408+cdils@users.noreply.github.com>
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 9, 2026

@chuckadams
Copy link
Copy Markdown
Contributor

chuckadams commented Apr 10, 2026

I suggest git rebase development to update this branch, which leaves only two conflicting files, one of which is trivial. The other one is class-updater.php, which I really don't know how to resolve, since this branch creates a large diff that appears to be mostly reverted in development and I don't know the whole story behind the changes.

I suspect it's a matter of choosing one or the other, but since the API is changed incompatibly, use sites may have to be updated either way

Signed-off-by: Carrie Dils <cdils@users.noreply.github.com>
@cdils cdils merged commit 701d07e into development Apr 13, 2026
2 checks passed
@cdils cdils deleted the release_1.4.0 branch April 13, 2026 16:42
@cdils cdils restored the release_1.4.0 branch April 13, 2026 16:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants