chore: cascade main → dev (51e599a) [skip ci] #193

Merged

jmiller merged 4 commits from main into dev 2026-05-27 03:48:22 +00:00

Conversation 0 Commits 4 Files Changed 4

+83 -22

jmiller commented 2026-05-27 03:48:21 +00:00

Owner

Copy Link

Copy Source

Automatic cascade

Forward-merging main (51e599a) into dev.

If conflicts exist, resolve manually and merge.

Auto-created by Cascade Main → Dev.

## Automatic cascade Forward-merging `main` (51e599a) into `dev`. If conflicts exist, resolve manually and merge. > Auto-created by **Cascade Main → Dev**.

jmiller added 4 commits 2026-05-27 03:48:22 +00:00

fix: preserve version suffix (-dev, -rc, etc.) during patch bump ... 030f057ab4

version_bump.php now detects and preserves the existing suffix from
manifest versions. The suffix should only change when the branch
changes, not on every patch bump.

version_read.php now returns the full version including suffix.

Authored-by: Moko Consulting
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Merge branch 'dev' ... 16ff7e611e

# Conflicts:
#	cli/version_bump.php

feat(ci): add version branch creation on stable release [skip ci] c73675234b

feat: add branch-cleanup workflow — auto-delete merged feature branches ... 51e599acef

Authored-by: Moko Consulting
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

jmiller merged commit a28236d120 into dev 2026-05-27 03:48:22 +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

mokostandards

MokoStandards compliance

needs-review

Awaiting code review

php

PHP code changes

priority: critical

Critical priority, must be addressed immediately

priority: high

High priority

priority: low

Low priority

priority: medium

Medium priority

push-failure

File push failure requiring attention

python

Python code changes

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

status: blocked

Blocked by another issue or dependency

status: in-progress

Currently being worked on

status: needs-review

Awaiting code 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

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

chore

Maintenance and housekeeping

documentation

Documentation improvements

enhancement

Improvement to existing functionality

feature

New feature or request

pending: dependency

Blocked by another issue or external dependency

pending: deployment

Tested and approved, awaiting deployment to production

pending: design

Needs UI/UX or architecture design before implementation

pending: documentation

Feature works, needs documentation/wiki update

pending: feedback

Awaiting feedback or decision from stakeholder

pending: review

Implementation complete, awaiting code review

pending: testing

Feature implemented but not yet tested

priority: critical

Must fix immediately

priority: high

Should fix soon

priority: low

Nice to have

priority: medium

Fix when convenient

refactor

Code restructuring without behavior change

roadmap

Planned feature or enhancement tracked on the roadmap

scope: client

Client-specific work

scope: dolibarr

Dolibarr modules and customizations

scope: infrastructure

Server, CI, backups, monitoring

scope: joomla

Joomla templates and extensions

scope: waas

MokoWaaS platform

security

Security vulnerability or hardening

status: blocked

Waiting on external dependency

status: duplicate

Duplicate of another issue

status: in-progress

Being worked on

status: needs-review

Ready for review

status: wontfix

Will not be addressed

No labels

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/moko-platform#193