fix: resolve merge conflicts and pretty name resolution #7

Merged

jmiller merged 2 commits from dev into main 2026-05-10 00:15:09 +00:00

Conversation 0 Commits 2 Files Changed 11

+163 -1189

jmiller commented 2026-05-10 00:13:46 +00:00

Owner

Copy Link

Copy Source

Summary

• Resolve all merge conflicts across 10 files
• Manifest <name> uses language key PLG_SYSTEM_MOKOJGDPC so release workflow resolves pretty name from .ini
• Consolidated CHANGELOG to single [Unreleased] section for release test
• Merged features from both branches (scheduled tasks + template category creation)

Test plan

• Release workflow should produce: Moko Gallery Calendar 01.04.00 (plg_system_mokojgdpc-01.04.00)
• Release body should show changelog content + SHA table
• No duplicate version headers in body

## Summary - Resolve all merge conflicts across 10 files - Manifest `<name>` uses language key `PLG_SYSTEM_MOKOJGDPC` so release workflow resolves pretty name from .ini - Consolidated CHANGELOG to single [Unreleased] section for release test - Merged features from both branches (scheduled tasks + template category creation) ## Test plan - Release workflow should produce: **Moko Gallery Calendar 01.04.00 (plg_system_mokojgdpc-01.04.00)** - Release body should show changelog content + SHA table - No duplicate version headers in body

jmiller added 1 commit 2026-05-10 00:13:46 +00:00

fix: resolve all merge conflicts, use language key for pretty name ... 7b06ad5cf9

- Manifest <name> now uses PLG_SYSTEM_MOKOJGDPC (language key) so
  release workflow resolves "Moko Gallery Calendar" from .ini
- Resolved merge conflicts in: manifest, .ini files, script.php,
  README.md, update-server.yml, .gitignore
- Merged both branches: keeps scheduled tasks, deferred creation,
  permissions templates, AND template category auto-creation
- CHANGELOG consolidated to single [Unreleased] for next release test

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

jmiller added 1 commit 2026-05-10 00:14:47 +00:00

merge: incorporate main release commits, keep dev conflict resolutions a4ac5a983c

jmiller merged commit f60c6c20bd into main 2026-05-10 00:15:09 +00:00

jmiller referenced this issue from a commit 2026-05-10 00:15:10 +00:00

Merge pull request 'fix: resolve merge conflicts and pretty name resolution' (#7) from dev into main

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

Clear labels

breaking-change

Breaking API or behavior change

ci-cd

CI/CD pipeline changes

config

Configuration changes

css

CSS/styling changes

dependencies

Dependency updates

deploy-failure

Deployment failed

documentation

Documentation changes

good first issue

Good for newcomers

health-check

Repo health check result

help wanted

Extra attention needed

html

HTML/template changes

joomla

Joomla extension

major-release

Major version release

minor-release

Minor version release

mokostandards

Related to MokoStandards framework

patch-release

Patch version release

php

PHP code

priority: critical

Must fix immediately

priority: high

Important, fix soon

priority: low

Nice to have

priority: medium

Normal priority

push-failure

Git push operation failed

release-candidate

Release candidate build

security

Security vulnerability or hardening

size/l

200-500 lines changed

size/m

50-200 lines changed

size/s

10-50 lines changed

size/xl

500+ lines changed

size/xs

< 10 lines changed

standards-drift

Deviates from MokoStandards

standards-update

MokoStandards compliance update

status: blocked

Blocked by dependency or decision

status: in-progress

Actively being worked on

status: needs-review

Awaiting code review

status: on-hold

Paused intentionally

status: wontfix

Will not be addressed

sync-failure

Sync or mirror failed

type: bug

Something isn't working

type: chore

Maintenance, dependencies, cleanup

type: enhancement

Improvement to existing feature

type: feature

New functionality

type: refactor

Code restructuring without behavior change

type: version

Version bump or release

version-drift

Version mismatch across files

work-in-progress

Draft or incomplete work

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/MokoGalleryCalendar#7