Repository navigation
chore: merge main into m18/cloud - #132
Merged
Merged
Conversation
…places (#128) * feat(sponsors): add a sponsors page with tiers and the open homepage places * fix(deps): update symfony/mime for CVE-2026-45070 * docs(sponsors): regenerate the README logos from the skill
Brings the sponsors page (#128), the MCP guide's read-only role (#129) and the MCP settings pane name (#130). The lock file from #128 carries symfony/mime 8.1.10, which clears CVE-2026-45070 and the composer audit failure on m18/cloud.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Merges
mainintom18/cloud.m18/cloudwas three commits behind:symfony/mimefrom 8.1.7 to 8.1.10, which fixes CVE-2026-45070 (PKSA-wtxr-p26d-nn42). That advisory is whycomposer audit --lockedfailed thephp (8.5)check on feat(pricing): ask anyone who uses TablePro for work to buy a license #131.Conflicts
tests/Feature/Chrome/SiteChromeTest.php: keptm18/cloud's account link (https://account.tablepro.app/?locale=) and dropped the GitHub Sponsors link, as feat(sponsors): add a sponsors page with tiers and the open homepage places #128 does. The footer now sends sponsors to/sponsors.docs/rebuild/design/sitemap.md: keptm18/cloud's slot table, with its mobile crops and aspect ratios, and applied fix(features): name the MCP settings pane as the app has since 0.80 #130's rename to themac-mcp-settingsrow in both languages, as section E.10 onmainspells it.Merge
Merge with a merge commit, not a squash, so the next sync starts from this one.
Checks
composer validate: valid.composer audit --locked: no advisories.