chore: sync main into dev to resolve conflicts #277

Closed

jmiller wants to merge 111 commits from main into dev

pull from: main

merge into: :dev

:main

:dev

:version/02.52.15

:version/02.52.13

:version/02.52.04

:version/02.52.00

:version/02.51.10

:version/02.51.08

:feature/271-chore-consolidate-helpdesk-issues-ticket

:feature/272-feat-full-rest-api-mcp-server-for-claude

:rc

:version/02.50.00

:feature/267-feat-plugin-based-dashboard-panel-system

Conversation 0 Commits 111 Files Changed 62

+2277 -2044

jmiller commented 2026-06-29 16:22:07 +00:00

Owner

Copy Link

Copy Source

Sync main boilerplate/docs changes into dev so PR #276 can merge cleanly.

Sync main boilerplate/docs changes into dev so PR #276 can merge cleanly.

jmiller added 111 commits 2026-06-29 16:22:07 +00:00

ci: sync auto-release.yml from Template-Joomla [skip ci] b88e68ee10

ci: sync branch-cleanup.yml from Template-Joomla [skip ci] eddc9c2fd4

chore(version): auto-bump patch 02.41.02-rc [skip ci] f47554e46c

ci: sync cascade-dev.yml from Template-Joomla [skip ci] 495083f89f

Merge pull request 'fix: update heartbeat URL from waas.dev to suite.dev.mokoconsulting.tech' (#220) from rc into main a4d9d6d129

chore(release): build 02.42.00 [skip ci] 7687da58c3

chore: promote changelog [Unreleased] → [02.42.00] 67721d0247

ci: sync ci-generic.yml from Template-Joomla [skip ci] b1d72bc23e

chore(release): build 02.43.00 [skip ci] 1404b699ad

chore: promote changelog [Unreleased] → [02.43.00] 9d8fd4eed1

chore: sync issue-branch.yml from Template-Generic [skip ci] cd7bdc03c8

chore: sync workflow-sync-trigger.yml from Template-Generic [skip ci] 1964c86ee0

Merge pull request 'fix(heartbeat): correct API route from mokosuiteclienthq to mokosuitehq' (#221) from rc into main 1c6c8a8473

chore(release): build 02.44.00 [skip ci] 222a52580c

chore: promote changelog [Unreleased] → [02.44.00] a4f55f6ba7

ci: sync auto-release.yml from Template-Joomla [skip ci] 43b8549402

ci: sync branch-cleanup.yml from Template-Joomla [skip ci] 344673ab8a

ci: sync cascade-dev.yml from Template-Joomla [skip ci] f03a522bb9

ci: sync ci-generic.yml from Template-Joomla [skip ci] 9d22ba0b10

chore: sync ci-generic.yml from Template-Generic [skip ci] 9085ccf474

chore: sync issue-branch.yml from Template-Generic [skip ci] 70c2aaae05

ci: sync cleanup.yml from Template-Joomla [skip ci] 1ebba18c16

ci: sync issue-branch.yml from Template-Joomla [skip ci] 706c088da1

ci: sync pr-check.yml from Template-Joomla [skip ci] 44ca197c36

ci: sync rc-revert.yml from Template-Joomla [skip ci] 9949bf7fda

ci: sync repo-health.yml from Template-Joomla [skip ci] c42b65ed38

ci: sync security-audit.yml from Template-Joomla [skip ci] 71a9da3f72

chore: sync cleanup.yml from Template-Generic [skip ci] 8606acf2fd

chore: sync pr-check.yml from Template-Generic [skip ci] 481893e182

chore: sync rc-revert.yml from Template-Generic [skip ci] 1308497e39

chore: sync repo-health.yml from Template-Generic [skip ci] 59f37f09cf

Merge pull request 'fix(heartbeat): align signature headers with HQ expectations' (#222) from rc into main 156cb1713f

chore(release): build 02.45.00 [skip ci] c4a77e2da7

chore: promote changelog [Unreleased] → [02.45.00] 91542cf759

chore: sync issue-branch.yml from Template-Generic [skip ci] 43646e826d

chore: sync ci-generic.yml from Template-Generic [skip ci] e21e345389

chore: sync gitleaks.yml from Template-Generic [skip ci] 44030cdc9c

chore: sync pr-check.yml from Template-Generic [skip ci] 7f272aabf9

ci: sync ci-joomla.yml from Template-Joomla [skip ci] 10b597b248

ci: sync issue-branch.yml from Template-Joomla [skip ci] 5c048ef5db

ci: sync rc-revert.yml from Template-Joomla [skip ci] f6e7082f44

chore: sync auto-release.yml from Template-Generic [skip ci] d26ada7d18

chore: sync workflow-sync-trigger.yml from Template-Generic [skip ci] e8e8c689e8

chore: sync composer-publish.yml from Template-Generic [skip ci] 6ecaf9923d

chore: sync pre-release.yml from Template-Generic [skip ci] ceb3cfacf7

chore: sync auto-release.yml from Template-Generic [skip ci] 70fe78e064

chore: remove automation directory ffa9edd33f

chore(version): pre-release bump to 02.46.99-dev [skip ci] dca4ef89a9

Merge pull request 'chore: remove automation directory' (#234) from fix/remove-automation into main 291f04eb81

chore: sync issue-branch.yml from Template-Generic [skip ci] 8044106f19

chore(release): build 02.46.99 [skip ci] c46373265d

chore: promote changelog [Unreleased] → [02.46.99] 5e889bbcff

chore: remove unused Makefile - builds handled by CI auto-release f143a959be

chore: sync auto-release.yml from Template-Generic [skip ci] a8d1e8f276

Merge branch 'dev' into main for v02.47 release ... 27d26f15ca

Resolves version/date conflicts by taking dev branch changes.
Removed monitor plugin and ticket automation (retired in dev).

chore: sync issue-branch.yml from Template-Generic [skip ci] 3aa1b43e96

Merge branch 'dev' into main — v02.47 unified UI, tours, cache module ... 19bbe92780

Resolve issue-branch.yml version conflict (take dev).

chore: remove deprecated .mokogitea/workflows/deploy-manual.yml [skip ci] 345483c6f9

chore: remove deprecated .mokogitea/workflows/composer-publish.yml [skip ci] 803464a584

chore: sync deploy-manual.yml from Template-Generic [skip ci] 1781ee8c67

chore: sync issue-branch.yml from Template-Generic [skip ci] bdb135bcb4

chore: remove security-audit.yml -- handled by MokoGitea 7f1bcb23bf

chore: sync auto-release.yml from Template-Generic [skip ci] 91edc73336

chore: sync version-set.yml from Template-Generic [skip ci] d772f10b6a

chore: sync auto-bump.yml from Template-Generic [skip ci] 81d2f1ceea

chore: sync auto-release.yml from Template-Generic [skip ci] ff21765973

chore: sync cleanup.yml from Template-Generic [skip ci] c9df811602

chore: sync deploy-manual.yml from Template-Generic [skip ci] edda6b7a51

chore: sync issue-branch.yml from Template-Generic [skip ci] fc61577422

chore: sync pr-check.yml from Template-Generic [skip ci] 35dac96d7a

chore: sync pre-release.yml from Template-Generic [skip ci] c096172c2c

chore: sync repo-health.yml from Template-Generic [skip ci] f4f47ad43a

chore: sync version-set.yml from Template-Generic [skip ci] 9d67a045f3

chore: sync workflow-sync-trigger.yml from Template-Generic [skip ci] 814b6879da

chore: sync ci-issue-reporter.yml from Template-Generic [skip ci] 1fd90366d6

chore: sync pr-check.yml from Template-Generic [skip ci] ef77ae83da

chore: sync repo-health.yml from Template-Generic [skip ci] 9df6bea4b7

chore: sync pre-release.yml from Template-Generic [skip ci] 467406f2e2

chore: sync rc-revert.yml from Template-Generic [skip ci] 4d6a12c378

chore: sync ci-generic.yml from Template-Generic [skip ci] 64482e59cd

Merge remote-tracking branch 'origin/main' into merge/dev-to-main-268 ... 7933909ac4

# Conflicts:
#	.mokogitea/workflows/deploy-manual.yml
#	.mokogitea/workflows/issue-branch.yml

Merge pull request 'Release: dev to main - UI cleanup, RL import, menu icons' (#269) from merge/dev-to-main-268 into main 9eb7ce03e6

chore(release): build 02.50.00 [skip ci] 1c0fa55955

chore: promote changelog [Unreleased] → [02.50.00] d2b4b70f0e

chore: sync issue-branch.yml from Template-Generic [skip ci] a867a8fdde

chore(version): pre-release bump to 02.51.01-dev [skip ci] 5313723c68

chore: sync issue-branch.yml from Template-Generic [skip ci] f0a8ad6c39

fix: heartbeat button shows proper errors instead of failing silently ... 1155b0fa17

- CSRF check returns JSON instead of die() with raw text
- JS parses non-JSON responses gracefully and shows server error
- Visual feedback (check/cross icon) on success/failure
- 3-second icon revert after result

Claude-Session: https://claude.ai/code/session_01Jo2JpjCwfHAh2HHRSjczKq

chore(version): pre-release bump to 02.51.08-dev [skip ci] 8496b66db2

fix: clear pending icon timeout on rapid heartbeat re-click ... f1345b0010

Prevents spinner color bleed and mid-flight icon reset when
user clicks the heartbeat button again before the 3s revert.

Claude-Session: https://claude.ai/code/session_01Jo2JpjCwfHAh2HHRSjczKq

Merge pull request 'fix: heartbeat button silent failure' (#270) from fix/heartbeat-error-reporting into main ... 62bf4af481

fix: heartbeat button silent failure (#270)

chore(release): build 02.51.08 [skip ci] e7b5f78deb

chore: promote changelog [Unreleased] → [02.51.08] fd65148f38

chore: sync issue-branch.yml from Template-Generic [skip ci] 99caa708b8

chore: sync auto-release.yml from Template-Generic [skip ci] ff1ee76d71

fix: correct menu item-level classes to match Joomla admin sidebar ... 4850928e6d

Components use item-level-1, sub-items use item-level-2 to align
with Atum template's native sidebar indentation and styling.

Claude-Session: https://claude.ai/code/session_01Jo2JpjCwfHAh2HHRSjczKq

chore(version): pre-release bump to 02.51.10-dev [skip ci] af193fc2bb

Merge pull request 'fix: correct menu item-level classes to match Joomla admin sidebar' (#273) from fix/menu-item-levels into main ... 4718ebf32d

fix: correct menu item-level classes to match Joomla admin sidebar (#273)

chore(release): build 02.51.10 [skip ci] 44c653e09b

chore: promote changelog [Unreleased] → [02.51.10] 6d56ec550a

chore: sync issue-branch.yml from Template-Generic [skip ci] eb99bae991

chore(release): build 02.52.00 [skip ci] 5c8192dd0d

chore: promote changelog [Unreleased] → [02.52.00] 67e9cc6b38

chore(version): pre-release bump to 02.52.02-dev [skip ci] 31a049141f

fix: add missing SQL migration for license_cache table and sync schema version ... e746afd835

The mokosuite_license_cache table was added to install.mysql.sql but
never had a corresponding update file. Existing installs (upgrading
from pre-02.48.20) never received this table.

Additionally, no SQL update files existed between 02.48.20 and 02.52.00,
causing Joomla to report a database schema mismatch (manifest says
02.52.00 but #__schemas is stuck at 02.48.20).

chore(version): pre-release bump to 02.52.03-dev [skip ci] 54e61ded92

chore(version): pre-release bump to 02.52.04-dev [skip ci] dea991a3b2

Merge pull request 'fix: sync schema version and add missing license_cache migration' (#275) from fix/schema-version-sync into main 8e564b1fca

chore(release): build 02.52.04 [skip ci] 7f1e99c818

chore: promote changelog [Unreleased] → [02.52.04] 886e36f4f4

chore: sync issue-branch.yml from Template-Generic [skip ci] aa52076cb0

jmiller closed this pull request 2026-06-29 16:23:12 +00:00

Pull request closed

Please reopen this pull request to perform a merge.

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

Clear labels

architecture

automation

Automated processes or scripts

breaking-change

Breaking API or functionality change

bug

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

duplicate

enhancement

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

invalid

javascript

JavaScript code changes

joomla

Joomla extension or component

major-release

Major version release (breaking changes)

minor-release

Minor version release (XX.YY.00)

mokostandards

MokoStandards compliance

needs-review

Awaiting code review

needs-testing

Requires manual or automated testing

patch-release

Patch version release (XX.YY.ZZ)

php

PHP code changes

priority: critical

priority: high

priority: low

priority: medium

push-failure

File push failure requiring attention

python

Python code changes

question

regression

Regression from a previous working state

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

standards-violation

Standards compliance failure

status: blocked

status: in-progress

status: needs-review

status: on-hold

Temporarily on hold

status: pending

Pending action or decision

status: wontfix

This will not be worked on

sync-failure

Bulk sync failure requiring attention

sync-report

Bulk sync run report

template-validation-failure

Template workflow validation failure

test-failure

Automated test 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: release

Release preparation or tracking

type: test

Test suite additions or changes

type: version

Version-related change

typescript

TypeScript code changes

version

Version bump or release

version-branch

Version branch related

version-drift

Version mismatch detected

work-in-progress

Work in progress, not ready for merge

No labels

Priority -

Type -

Milestone

No items

No Milestone

Assignees

Clear assignees

jmiller (Jonathan Miller)

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: MokoConsulting/MokoSuiteClient#277