Skip to content

chore: Merge development into main - #4

Merged
rubenvdlinde merged 5 commits into
mainfrom
development
Mar 5, 2026
Merged

chore: Merge development into main#4
rubenvdlinde merged 5 commits into
mainfrom
development

Conversation

@rubenvdlinde

Copy link
Copy Markdown
Contributor

Merge development branch into main to sync code cleanup and quality tooling changes.

rubenvdlinde and others added 5 commits February 6, 2026 13:17
Convert from PHP Nextcloud app to ExApp with Docker-based deployment.
Add standardized CI/CD workflows for unstable release, dev-to-beta PR
creation, branch protection, and lint checks.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Enforce that PRs to main can only come from beta or hotfix branches,
and PRs to beta can only come from development or hotfix branches.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* fix: Return HTTP 200 from heartbeat endpoint during init wait

AppAPI requires a successful heartbeat before calling /init, but the
wrapper returned 503 when the internal Django service wasn't running yet.
Return 200 with {"status":"waiting"} to break the chicken-and-egg cycle.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* fix: Add PHPCS/PHPMD/Psalm quality tooling

Add phpcs.xml, phpmd.xml, psalm.xml, custom NamedParametersSniff, and
update composer.json with quality dependencies.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
@rubenvdlinde
rubenvdlinde merged commit 4208b1e into main Mar 5, 2026
2 of 5 checks passed
MWest2020 pushed a commit that referenced this pull request Jul 16, 2026
…n' (#4) from fix/app-icon-svg-level-fill into development
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.

2 participants