Repository navigation
chore: reconcile main into dev (#3780, #3786) - #3830
Merged
Merged
Conversation
…#3069) Bumps [ip-address](https://github.com/beaugunderson/ip-address) from 10.5.0 to 10.7.2. - [Release notes](https://github.com/beaugunderson/ip-address/releases) - [Commits](beaugunderson/ip-address@v10.5.0...v10.7.2) --- updated-dependencies: - dependency-name: ip-address dependency-version: 10.7.2 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [ip-address](https://github.com/beaugunderson/ip-address) from 10.4.0 to 10.7.2. - [Release notes](https://github.com/beaugunderson/ip-address/releases) - [Commits](beaugunderson/ip-address@v10.4.0...v10.7.2) --- updated-dependencies: - dependency-name: ip-address dependency-version: 10.7.2 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [hono](https://github.com/honojs/hono) from 4.13.1 to 4.13.7. - [Release notes](https://github.com/honojs/hono/releases) - [Commits](honojs/hono@v4.13.1...v4.13.7) --- updated-dependencies: - dependency-name: hono dependency-version: 4.13.7 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [hono](https://github.com/honojs/hono) from 4.13.0 to 4.13.7. - [Release notes](https://github.com/honojs/hono/releases) - [Commits](honojs/hono@v4.13.0...v4.13.7) --- updated-dependencies: - dependency-name: hono dependency-version: 4.13.7 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [brace-expansion](https://github.com/juliangruber/brace-expansion) from 5.0.9 to 5.0.12. - [Release notes](https://github.com/juliangruber/brace-expansion/releases) - [Commits](juliangruber/brace-expansion@v5.0.9...v5.0.12) --- updated-dependencies: - dependency-name: brace-expansion dependency-version: 5.0.12 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Copies the README, hero images and 1.0 screenshots from dev so the GitHub landing page carries the 1.0 positioning ahead of the release cut. The manifest entries for Inbox and Projects screenshots point at the portal component directory rather than the dev-only component files (the screenshot guard requires every source path to exist on this branch); the dev manifest's more precise paths win when dev merges into main. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
docs: bring the 1.0 README refresh to main (#3741)
…enshot Adds a Launch on AWS Marketplace button beside the DigitalOcean one and points the AWS bullet at the Marketplace listing, keeping the self-build AMI/CloudFormation path as the alternative. Removes the Files rail screenshot from the README, the screenshot store and its manifest entry. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
docs(readme): AWS Marketplace launch button, drop the Files rail screenshot (main)
…3786) Bumps [source-map-js](https://github.com/7rulnik/source-map-js) from 1.2.1 to 1.2.2. - [Release notes](https://github.com/7rulnik/source-map-js/releases) - [Changelog](https://github.com/7rulnik/source-map-js/blob/main/CHANGELOG.md) - [Commits](7rulnik/source-map-js@v1.2.1...v1.2.2) --- updated-dependencies: - dependency-name: source-map-js dependency-version: 1.2.2 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [proxy-addr](https://github.com/jshttp/proxy-addr) from 2.0.7 to 2.0.8. - [Release notes](https://github.com/jshttp/proxy-addr/releases) - [Changelog](https://github.com/jshttp/proxy-addr/blob/master/HISTORY.md) - [Commits](jshttp/proxy-addr@v2.0.7...v2.0.8) --- updated-dependencies: - dependency-name: proxy-addr dependency-version: 2.0.8 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…mmits) Merge origin/main so main is contained in dev again. Conflict in docs/screenshots/MANIFEST.yaml resolved to dev's side (the more specific portal source paths, all of which exist on dev). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
vybe
approved these changes
Oct 20, 2026
vybe
left a comment
vybe
left a comment
Contributor
There was a problem hiding this comment.
merge-train: reconcile verified — second parent is main tip, clean vs dev, required checks green. Merging with a merge commit.
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.
Dependabot security PRs open against
mainby GitHub design (see.github/dependabot.yml).mainheld 11 commitsdevdid not have. This mergesorigin/mainback somain ⊂ dev.Merge with a merge commit, not squash. A squash drops the
maincommits fromdev's history and the drift stays.What is in it
package-lock.jsonproxy-addr2.0.7 → 2.0.8 (#3780),hono4.13.0 → 4.13.7 (#2672),ip-address10.4.0 → 10.7.2 (#3068)src/mcp-server/package.json+ lockhono4.13.1 → 4.13.7 (#2673),ip-addressoverride>=10.5.0→>=10.7.2(#3069)tests/git_sync/package-lock.jsonbrace-expansion5.0.9 → 5.0.12 (#3198)source-map-js1.2.2 (#3786) and the README commits (#3772, #3773) were already ondevin content; they come along as history only.Conflict
docs/screenshots/MANIFEST.yaml: resolved todev's side.devlists the specific portal sources (PortalInbox*.vue,portal/projects);mainhad the broadercomponents/portal. Alldevpaths exist.Check:
git rev-list --count HEAD..origin/main= 0.🤖 Generated with Claude Code