MokoConsulting/MokoSuiteOpenGraph
1
0
Fork 0
Code Issues 4 Pull Requests Releases 2 Wiki Activity

chore(sync): cascade main -> dev (conflict-resolved) #124

Merged
jmiller merged 57 commits from chore/cascade-main-to-dev into dev 2026-07-09 23:23:17 +00:00
Conversation 0 Commits 57 Files Changed 27
+375 -116
jmiller commented 2026-07-09 23:23:12 +00:00
Owner
Copy Link
Copy Source

Brings main (workflow syncs from Template-Generic + doc normalization) into dev. Conflicts resolved: dev keeps its higher version + CHANGELOG; workflows and normalized docs taken from main. Supersedes the auto cascade PR.

https://claude.ai/code/session_01MrxXW9iyuDda5yDZrjZMbF

Brings main (workflow syncs from Template-Generic + doc normalization) into dev. Conflicts resolved: dev keeps its higher version + CHANGELOG; workflows and normalized docs taken from main. Supersedes the auto cascade PR. https://claude.ai/code/session_01MrxXW9iyuDda5yDZrjZMbF
jmiller added 57 commits 2026-07-09 23:23:12 +00:00
Release: promote dev → main — v01.06.x cycle (dashboard, edit UI, ACL, security, forward-compat) b93ce7b872
chore(release): build 01.07.00 [skip ci] a038e43a3c
chore: promote changelog [Unreleased] → [01.07.00] faf65c5d9c
chore: sync issue-branch.yml from Template-Generic [skip ci] 73bd957808
chore: sync auto-release.yml from Template-Generic [skip ci] a26a831460
chore: sync ci-generic.yml from Template-Generic [skip ci] 54ba0828c5
chore: sync cleanup.yml from Template-Generic [skip ci] e19bda1a39
chore: sync notify.yml from Template-Generic [skip ci] b3e9cb33dd
chore: sync pr-check.yml from Template-Generic [skip ci] 23ae4de3fa
chore: sync pre-release.yml from Template-Generic [skip ci] 513efe57f9
chore: sync sync-on-merge.yml from Template-Generic [skip ci] 585b156b84
chore: sync branch-cleanup.yml from Template-Generic [skip ci] c0aab4873e
chore: sync ci-generic.yml from Template-Generic [skip ci] 5ede6f05f6
chore: sync pr-check.yml from Template-Generic [skip ci] 440aaff550
chore: sync ci-generic.yml from Template-Generic [skip ci] 8eb296115c
chore: sync pr-check.yml from Template-Generic [skip ci] e62c5090bf
chore: sync pr-check.yml from Template-Generic [skip ci] 7e1ebfefae
chore: sync auto-release.yml from Template-Generic [skip ci] 8a6b133354
chore: sync cleanup.yml from Template-Generic [skip ci] 36d77f2a8a
chore: sync notify.yml from Template-Generic [skip ci] afa5b02471
chore: sync auto-bump.yml from Template-Generic [skip ci] 51e6284a28
chore: sync auto-release.yml from Template-Generic [skip ci] a35afba514
chore: sync branch-cleanup.yml from Template-Generic [skip ci] 55aa70cb35
chore: sync cascade-dev.yml from Template-Generic [skip ci] 13ead69edb
chore: sync ci-issue-reporter.yml from Template-Generic [skip ci] 22b60342ff
chore: sync gitleaks.yml from Template-Generic [skip ci] 8ee1ee1215
chore: sync pr-check.yml from Template-Generic [skip ci] fdf4427cc0
chore: sync pre-release.yml from Template-Generic [skip ci] 59a0df9a8b
chore: sync rc-revert.yml from Template-Generic [skip ci] 6622f1b338
chore: sync repo-health.yml from Template-Generic [skip ci] 76a6f60936
chore: sync sync-on-merge.yml from Template-Generic [skip ci] 94b10a7596
chore: sync version-set.yml from Template-Generic [skip ci] 35ee4fd059
chore: sync pr-check.yml from Template-Generic [skip ci] 2676477600
chore: sync workflow-sync-trigger.yml from Template-Generic [skip ci] a883da634d
chore: sync auto-bump.yml from Template-Generic [skip ci] 9f3cbadc94
chore: sync auto-release.yml from Template-Generic [skip ci] d6ab0d9871
chore: sync branch-cleanup.yml from Template-Generic [skip ci] af825540f7
chore: sync cascade-dev.yml from Template-Generic [skip ci] 1220cce6ed
chore: sync ci-generic.yml from Template-Generic [skip ci] 5fe6233946
chore: sync ci-issue-reporter.yml from Template-Generic [skip ci] c78139c7df
chore: sync cleanup.yml from Template-Generic [skip ci] d10a3ccf67
chore: sync gitleaks.yml from Template-Generic [skip ci] ed2fd36d50
chore: sync issue-branch.yml from Template-Generic [skip ci] 6606085f51
chore: sync notify.yml from Template-Generic [skip ci] e7ba136e74
chore: sync pr-check.yml from Template-Generic [skip ci] e182a15a46
chore: sync pre-release.yml from Template-Generic [skip ci] d3ef0b7d81
chore: sync rc-revert.yml from Template-Generic [skip ci] ee54c27acc
chore: sync repo-health.yml from Template-Generic [skip ci] 2be1858164
chore: sync version-set.yml from Template-Generic [skip ci] e186fe5843
chore: sync workflow-sync-trigger.yml from Template-Generic [skip ci] c95fea552a
chore(docs): normalize refs — MokoStandards->org wiki, moko-platform->mokocli, residual MokoGitea/MokoSuite
Universal: Pre-Release / Build Pre-Release (${{ inputs.stability || github.ref_name }}) (push) Successful in 20s
Details
66b3c10dda 
Non-workflow docs/config only (CLAUDE.md, README, branch-protection, ISSUE_TEMPLATE/config.yml,
ci-issue-reporter). Workflow files, manifest schema, and Makefile install paths left for the
forge-rebrand gate. Authored-by: Moko Consulting
Merge chore/normalize-docs: normalize doc/config refs
Cascade Main -> Dev / Cascade main -> dev (push) Successful in 8s
Details
Universal: PR Check / Branch Policy (pull_request) Successful in 1s
Details
Universal: PR Check / Require Docs Update (pull_request) Has been skipped
Details
Universal: PR Check / Wiki Update Reminder (pull_request) Has been skipped
Details
Universal: PR Check / Secret Scan (pull_request) Successful in 7s
Details
Universal: PR Check / Validate PR (pull_request) Failing after 25s
Details
Joomla: Metadata Validation / Validate Joomla Metadata (pull_request) Failing after 15s
Details
Generic: Project CI / Lint & Validate (pull_request) Successful in 54s
Details
Generic: Project CI / Tests (pull_request) Has been cancelled
Details
Universal: PR Check / Build RC Package (pull_request) Has been cancelled
Details
Universal: PR Check / Report Issues (pull_request) Has been cancelled
Details
d02334b0da
chore: sync auto-release.yml from Template-Generic [skip ci] afc5ef797a
chore: sync ci-generic.yml from Template-Generic [skip ci] 0a82276565
chore: sync pr-check.yml from Template-Generic [skip ci] 8738b09d83
chore: sync pre-release.yml from Template-Generic [skip ci] 79cd2fd9e6
Merge remote-tracking branch 'origin/main' into chore/cascade-main-to-dev
Universal: PR Check / Require Docs Update (pull_request) Has been skipped
Details
Universal: PR Check / Wiki Update Reminder (pull_request) Has been skipped
Details
Universal: PR Check / Branch Policy (pull_request) Successful in 1s
Details
Universal: PR Check / Secret Scan (pull_request) Successful in 7s
Details
RC Revert / Rename rc/ back to dev/ (pull_request) Has been skipped
Details
Branch Cleanup / Delete merged branch (pull_request) Successful in 2s
Details
Generic: Project CI / Lint & Validate (pull_request) Successful in 11s
Details
Universal: Pre-Release / Build Pre-Release (${{ inputs.stability || github.ref_name }}) (push) Failing after 5s
Details
Generic: Project CI / Tests (pull_request) Failing after 26s
Details
Universal: PR Check / Validate PR (pull_request) Successful in 32s
Details
Joomla: Metadata Validation / Validate Joomla Metadata (pull_request) Failing after 32s
Details
Universal: PR Check / Build RC Package (pull_request) Has been cancelled
Details
Universal: PR Check / Report Issues (pull_request) Has been cancelled
Details
419e333f20 
# Conflicts:
#	.mokogitea/workflows/issue-branch.yml
#	CHANGELOG.md
#	CODE_OF_CONDUCT.md
#	GOVERNANCE.md
#	README.md
#	SECURITY.md
#	source/packages/com_mokoog/mokoog.xml
#	source/packages/plg_content_mokoog/mokoog.xml
#	source/packages/plg_system_mokoog/mokoog.xml
#	source/packages/plg_webservices_mokoog/mokoog.xml
#	source/pkg_mokoog.xml
jmiller merged commit 50d56b2bf6 into dev 2026-07-09 23:23:17 +00:00
jmiller deleted branch chore/cascade-main-to-dev 2026-07-09 23:23:18 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
bug
Something is broken
 documentation
Documentation improvements
 enhancement
production-readiness
Required before v1.0 release
 security
Security vulnerability or hardening
 testing
Test coverage and QA
bug
Something is not working
 duplicate
This issue or pull request already exists
 enhancement
New feature
 help wanted
Need some help
 invalid
Something is wrong
 question
More information is needed
 wontfix
This won't be fixed
No labels
Priority -
Type -
Milestone
No items
No Milestone
Assignees
Clear assignees
jmiller (Jonathan Miller)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: MokoConsulting/MokoSuiteOpenGraph#124
Delete Branch "chore/cascade-main-to-dev"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?