MokoConsulting/MokoOnyx
1
0
Fork 0
Code Issues 10 Pull Requests 1 Releases 5 Wiki Activity

chore: sync main into dev (resolve 98-commit infra/doc divergence) #151

Merged
jmiller merged 100 commits from chore/sync-main-to-dev into dev 2026-07-13 00:22:39 +00:00
Conversation 0 Commits 100 Files Changed 55
+3538 -1747
jmiller commented 2026-07-13 00:22:26 +00:00
Owner
Copy Link
Copy Source

Brings dev up to date with main so dev becomes a clean superset again (dev must always be >= main).

main was 98 commits ahead of dev (Template-Generic workflow syncs + docs-rebranding normalization) that were never cascaded back. This merge reconciles them.

All 7 conflicts were single VERSION header-stamp lines (bodies auto-merged cleanly):

  • issue-branch.yml -> kept main (01.00.00, its Template-Generic semver)
  • CHANGELOG/SECURITY/templateDetails/card.php/article-metadata/a11y-high-contrast.css -> kept dev (02.27.09, the template version)

Social floating collapsible feature (PR #149) preserved. After this merges, PR #150 (dev->main) will be conflict-free.

Brings dev up to date with main so dev becomes a clean superset again (dev must always be >= main). main was 98 commits ahead of dev (Template-Generic workflow syncs + docs-rebranding normalization) that were never cascaded back. This merge reconciles them. All 7 conflicts were single VERSION header-stamp lines (bodies auto-merged cleanly): - issue-branch.yml -> kept main (01.00.00, its Template-Generic semver) - CHANGELOG/SECURITY/templateDetails/card.php/article-metadata/a11y-high-contrast.css -> kept dev (02.27.09, the template version) Social floating collapsible feature (PR #149) preserved. After this merges, PR #150 (dev->main) will be conflict-free.
jmiller added 99 commits 2026-07-13 00:22:26 +00:00
Merge pull request 'release: collapsible social bar, tooltips, URL validation, blog image fix' (#144) from dev into main ebf365dfb3
chore(release): build 02.27.00 [skip ci] fe362d3b28
chore: promote changelog [Unreleased] → [02.27.00] 138ee2ac40
chore: sync issue-branch.yml from Template-Generic [skip ci] 6f67f7af37
chore: sync composer-publish.yml from Template-Generic [skip ci] 575588a14f
chore: sync pre-release.yml from Template-Generic [skip ci] 440cf41c3e
chore: sync auto-release.yml from Template-Generic [skip ci] 56b8d3b78c
chore: remove unused Makefile - builds handled by CI auto-release 71b7b3307a
chore: sync auto-release.yml from Template-Generic [skip ci] 0947250568
chore: remove deprecated .mokogitea/workflows/deploy-manual.yml [skip ci] d5bdb3871e
chore: remove deprecated .mokogitea/workflows/composer-publish.yml [skip ci] b7ec2a7efa
chore: sync deploy-manual.yml from Template-Generic [skip ci] bbe44cc31d
chore: remove security-audit.yml -- handled by MokoGitea 0cf1fed629
chore: sync auto-release.yml from Template-Generic [skip ci] 1ca4549994
chore: sync version-set.yml from Template-Generic [skip ci] bef3ce381c
chore: sync auto-bump.yml from Template-Generic [skip ci] 148aaecfa4
chore: sync auto-release.yml from Template-Generic [skip ci] 69eda2d1c6
chore: sync cleanup.yml from Template-Generic [skip ci] bace9d0205
chore: sync deploy-manual.yml from Template-Generic [skip ci] 556d282550
chore: sync issue-branch.yml from Template-Generic [skip ci] 15e8dc15f0
chore: sync pr-check.yml from Template-Generic [skip ci] 9b9b6aed89
chore: sync pre-release.yml from Template-Generic [skip ci] b0e7e84cd5
chore: sync repo-health.yml from Template-Generic [skip ci] f78290d8fa
chore: sync version-set.yml from Template-Generic [skip ci] f22f9dc440
chore: sync workflow-sync-trigger.yml from Template-Generic [skip ci] 2c43418933
chore: sync ci-issue-reporter.yml from Template-Generic [skip ci] d3dee12348
chore: sync pr-check.yml from Template-Generic [skip ci] 5f3f94f5f6
chore: sync repo-health.yml from Template-Generic [skip ci] 1a7a856a09
chore: sync pre-release.yml from Template-Generic [skip ci] 96b4b42787
chore: sync rc-revert.yml from Template-Generic [skip ci] 4ce0c67880
chore: sync ci-generic.yml from Template-Generic [skip ci] c3d54b2c2e
chore: sync auto-release.yml from Template-Generic [skip ci] 0aa0569ba3
refactor(css): remove redundant .text-bg-* combined utility
Joomla: Extension CI / Release Readiness Check (pull_request) Failing after 6s
Details
Generic: Repo Health / Access control (pull_request) Successful in 2s
Details
Generic: Repo Health / Site Health (pull_request) Has been skipped
Details
Generic: Project CI / Lint & Validate (pull_request) Successful in 15s
Details
Joomla: Extension CI / Lint & Validate (pull_request) Failing after 13s
Details
Universal: PR Check / Branch Policy (pull_request) Failing after 1s
Details
Universal: Pre-Release / Build Pre-Release (${{ inputs.stability || github.ref_name }}) (push) Successful in 18s
Details
Universal: Build & Release / Promote to RC (pull_request) Has been skipped
Details
Universal: Build & Release / Build & Release Pipeline (pull_request) Has been skipped
Details
Universal: PR Check / Validate PR (pull_request) Failing after 4s
Details
Universal: PR Check / Secret Scan (pull_request) Successful in 5s
Details
Joomla: Metadata Validation / Validate Joomla Metadata (pull_request) Failing after 36s
Details
Generic: Project CI / Tests (pull_request) Has been cancelled
Details
Joomla: Extension CI / Tests (PHP 8.2) (pull_request) Has been cancelled
Details
Joomla: Extension CI / Tests (PHP 8.3) (pull_request) Has been cancelled
Details
Joomla: Extension CI / PHPStan Analysis (pull_request) Has been cancelled
Details
Joomla: Extension CI / Build RC Pre-Release (pull_request) Has been cancelled
Details
Generic: Repo Health / Scripts governance (pull_request) Has been cancelled
Details
Generic: Repo Health / Repository health (pull_request) Has been cancelled
Details
Generic: Repo Health / Report: Scripts Governance (pull_request) Has been cancelled
Details
Generic: Repo Health / Report: Repository Health (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
168c091352 
.text-bg-* both (a) had a misleading prefix and (b) forced a black/white
foreground that fought the theme. The theme already provides separate,
theme-aware utilities: .text-* (color: var(--*-rgb)) and .bg-*
(background-color: var(--*-rgb)). Remove .text-bg-* and compose
.text-{ctx} + .bg-{ctx} instead.

Authored-by: Moko Consulting
chore(version): pre-release bump to 02.27.06-dev [skip ci]
RC Revert / Rename rc/ back to dev/ (pull_request) Has been skipped
Details
Branch Cleanup / Delete merged branch (pull_request) Successful in 2s
Details
Universal: Build & Release / Promote to RC (pull_request) Has been skipped
Details
Universal: Build & Release / Build & Release Pipeline (pull_request) Successful in 17s
Details
Universal: Workflow Sync Trigger / Sync workflows to live repos (pull_request) Successful in 3m18s
Details
c54b164826
Merge pull request 'refactor(css): remove redundant .text-bg-* combined utility' (#146) from fix/text-bg-background-only into main 0d205bcc65
chore(release): build 02.27.06 [skip ci] 892bdee751
chore: promote changelog [Unreleased] → [02.27.06] e08fccd1d9
chore: sync issue-branch.yml from Template-Generic [skip ci] a9094817ca
fix: remove orphaned deploy-manual workflow [skip ci] 5dadb43748
Merge pull request 'fix: remove orphaned deploy-manual workflow' (#147) from fix/remove-deploy-manual into main 6c343b5c42 
fix: remove orphaned deploy-manual workflow [skip ci]
chore: sync auto-release.yml from Template-Generic [skip ci] a93a12b504
chore: sync ci-generic.yml from Template-Generic [skip ci] e56a44aae2
chore: sync cleanup.yml from Template-Generic [skip ci] a3bb855a1c
chore: sync notify.yml from Template-Generic [skip ci] c5d70581d5
chore: sync pr-check.yml from Template-Generic [skip ci] e48c18449f
chore: sync pre-release.yml from Template-Generic [skip ci] 7ec42120fc
chore: sync sync-on-merge.yml from Template-Generic [skip ci] b55c9ff833
chore: sync branch-cleanup.yml from Template-Generic [skip ci] 1ee461f2c9
chore: sync ci-generic.yml from Template-Generic [skip ci] 57fb62ffc3
chore: sync pr-check.yml from Template-Generic [skip ci] 1962b10dec
chore: sync ci-generic.yml from Template-Generic [skip ci] 61b42fdfde
chore: sync pr-check.yml from Template-Generic [skip ci] 9ce4223bb3
chore: sync pr-check.yml from Template-Generic [skip ci] f66d80d61e
chore: sync auto-release.yml from Template-Generic [skip ci] ddaed01a38
chore: sync cleanup.yml from Template-Generic [skip ci] c0a762d37e
chore: sync notify.yml from Template-Generic [skip ci] b025362d92
chore: sync auto-bump.yml from Template-Generic [skip ci] fc5bf68017
chore: sync auto-release.yml from Template-Generic [skip ci] a0f73280e4
chore: sync branch-cleanup.yml from Template-Generic [skip ci] 1820b98369
chore: sync cascade-dev.yml from Template-Generic [skip ci] 0ac6dce06b
chore: sync ci-issue-reporter.yml from Template-Generic [skip ci] 80cd0ee5ab
chore: sync gitleaks.yml from Template-Generic [skip ci] 1e1d372ff0
chore: sync pr-check.yml from Template-Generic [skip ci] cef5f897d3
chore: sync pre-release.yml from Template-Generic [skip ci] 21bfd03693
chore: sync rc-revert.yml from Template-Generic [skip ci] 635577e699
chore: sync repo-health.yml from Template-Generic [skip ci] dc9d2955e8
chore: sync auto-bump.yml from Template-Generic [skip ci] 08c8d22189
chore: sync gitleaks.yml from Template-Generic [skip ci] 6ad1a3d937
chore: sync pre-release.yml from Template-Generic [skip ci] b410550fd8
chore: sync rc-revert.yml from Template-Generic [skip ci] c19c43942a
chore: sync sync-on-merge.yml from Template-Generic [skip ci] 4f1abee85f
chore: sync version-set.yml from Template-Generic [skip ci] 5a52c5ed6f
chore: sync pr-check.yml from Template-Generic [skip ci] da1765f04d
chore: sync workflow-sync-trigger.yml from Template-Generic [skip ci] d9544de034
chore: sync auto-bump.yml from Template-Generic [skip ci] 8af693ca8f
chore: sync auto-release.yml from Template-Generic [skip ci] 3a4d518a14
chore: sync branch-cleanup.yml from Template-Generic [skip ci] 8fc1ada2f7
chore: sync cascade-dev.yml from Template-Generic [skip ci] 9171576664
chore: sync ci-generic.yml from Template-Generic [skip ci] 5f4dc490ca
chore: sync ci-issue-reporter.yml from Template-Generic [skip ci] cc74944480
chore: sync cleanup.yml from Template-Generic [skip ci] d24c3f95ad
chore: sync gitleaks.yml from Template-Generic [skip ci] 25e23af1f7
chore: sync issue-branch.yml from Template-Generic [skip ci] 5103631d61
chore: sync notify.yml from Template-Generic [skip ci] d448aca8a8
chore: sync pr-check.yml from Template-Generic [skip ci] e91844013f
chore: sync pre-release.yml from Template-Generic [skip ci] b50aeefbdf
chore: sync rc-revert.yml from Template-Generic [skip ci] 1f56b49f64
chore: sync repo-health.yml from Template-Generic [skip ci] 0baf843677
chore: sync version-set.yml from Template-Generic [skip ci] bab2a96148
chore: sync workflow-sync-trigger.yml from Template-Generic [skip ci] 18558f0386
docs(wiki): normalize in-repo wiki branding (MokoGitea/mokocli/MokoStandards->org wiki/MokoSuite)
Universal: Pre-Release / Build Pre-Release (${{ inputs.stability || github.ref_name }}) (push) Successful in 30s
Details
907b03e701
Merge fix/rebrand-wiki-docs: normalize in-repo wiki branding
Cascade Main -> Dev / Cascade main -> dev (push) Successful in 17s
Details
Universal: PR Check / Branch Policy (pull_request) Successful in 2s
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 6s
Details
Universal: PR Check / Validate PR (pull_request) Failing after 29s
Details
Joomla: Metadata Validation / Validate Joomla Metadata (pull_request) Failing after 17s
Details
Generic: Project CI / Lint & Validate (pull_request) Successful in 1m13s
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
de6aa22bdb
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 29s
Details
bd38e57788 
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
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 8s
Details
Generic: Project CI / Lint & Validate (pull_request) Successful in 16s
Details
Cascade Main -> Dev / Cascade main -> dev (push) Successful in 4s
Details
Joomla: Metadata Validation / Validate Joomla Metadata (pull_request) Failing after 13s
Details
Universal: PR Check / Validate PR (pull_request) Failing after 1m3s
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
2deb05feb4
chore: sync auto-release.yml from Template-Generic [skip ci] 2133ce8384
chore: sync ci-generic.yml from Template-Generic [skip ci] fdd1f32003
chore: sync pr-check.yml from Template-Generic [skip ci] 6c238ccb94
chore: sync pre-release.yml from Template-Generic [skip ci] cd40561639
chore: sync main into dev (resolve infra/doc divergence)
Universal: PR Check / Branch Policy (pull_request) Successful in 2s
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 6s
Details
Generic: Project CI / Tests (pull_request) Failing after 9s
Details
Generic: Project CI / Lint & Validate (pull_request) Successful in 12s
Details
Universal: Pre-Release / Build Pre-Release (${{ inputs.stability || github.ref_name }}) (push) Successful in 14s
Details
Joomla: Metadata Validation / Validate Joomla Metadata (pull_request) Failing after 9s
Details
Universal: PR Check / Validate PR (pull_request) Failing after 15s
Details
Universal: PR Check / Build RC Package (pull_request) Has been cancelled
Details
Universal: PR Check / Report Issues (pull_request) Has been cancelled
Details
82e04b1818 
# Conflicts:
#	.mokogitea/workflows/issue-branch.yml
#	CHANGELOG.md
#	SECURITY.md
#	source/html/layouts/joomla/module/card.php
#	source/html/layouts/mokoonyx/article-metadata.php
#	source/media/css/a11y-high-contrast.css
#	source/templateDetails.xml
jmiller merged commit 5dee7aec96 into dev 2026-07-13 00:22:39 +00:00
jmiller deleted branch chore/sync-main-to-dev 2026-07-13 00:22:40 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
automation
Automated processes or scripts
 breaking-change
Breaking API or functionality change
 build
Build system changes
 ci-cd
CI/CD pipeline changes
 config
Configuration file changes
 css
CSS/styling changes
 dependencies
Dependency updates
 deploy-failure
Automated deploy failure tracking
 docker
Docker configuration changes
 documentation
Documentation changes
 dolibarr
Dolibarr module or extension
 generic
Generic project or library
 good first issue
Good for newcomers
 health-check
Repository health check results
 health: excellent
Health score 90-100
 health: fair
Health score 50-69
 health: good
Health score 70-89
 health: poor
Health score below 50
 help wanted
Extra attention needed
 html
HTML template changes
 javascript
JavaScript code changes
 joomla
Joomla extension or component
 major-release
Major version release
 minor-release
Minor version release
 mokostandards
MokoStandards compliance
 needs-review
Awaiting code review
 patch-release
Patch version release
 php
PHP code changes
 push-failure
File push failure requiring attention
 python
Python code changes
 release-candidate
Release candidate build
 security
Security-related changes
 size/l
Large change (101-300 lines)
 size/m
Medium change (31-100 lines)
 size/s
Small change (11-30 lines)
 size/xl
Extra large change (301-1000 lines)
 size/xs
Extra small change (1-10 lines)
 size/xxl
Extremely large change (1000+ lines)
 standards-drift
Repository drifted from MokoStandards
 standards-update
MokoStandards sync update
 sync-failure
Bulk sync failure requiring attention
 sync-report
Bulk sync run report
 template-validation-failure
Template workflow validation failure
 tests
Test suite changes
 type: bug
Something isn't working
 type: chore
Maintenance tasks
 type: enhancement
Enhancement to existing feature
 type: feature
New feature or request
 type: refactor
Code refactoring
 type: version
Version-related change
 typescript
TypeScript code changes
 version
Version bump or release
 version-drift
Version mismatch detected
 work-in-progress
Work in progress, not ready for merge
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/MokoOnyx#151
Delete Branch "chore/sync-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?