Skip to content

sync upstream 1.124#52

Merged
flo-bit merged 62 commits into
eurosky/forkfrom
flo/merge-upstream-1.124
Jun 10, 2026
Merged

sync upstream 1.124#52
flo-bit merged 62 commits into
eurosky/forkfrom
flo/merge-upstream-1.124

Conversation

@flo-bit

@flo-bit flo-bit commented Jun 10, 2026

Copy link
Copy Markdown
Collaborator

No description provided.

surfdude29 and others added 30 commits June 8, 2026 02:42
Co-authored-by: Samuel Newman <mozzius@protonmail.com>
Co-authored-by: Samuel Newman <mozzius@protonmail.com>
)

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-authored-by: Samuel Newman <mozzius@protonmail.com>
…y-social#10784)

Co-authored-by: Eric Bailey <git@esb.lol>
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
…ial#10754)

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-authored-by: Samuel Newman <mozzius@protonmail.com>
ds-boyce and others added 28 commits June 9, 2026 10:16
…ial#10801)

Co-authored-by: Samuel Newman <mozzius@protonmail.com>
)

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-authored-by: Eric Bailey <git@esb.lol>
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
…0838)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-authored-by: DS Boyce <260543580+ds-boyce@users.noreply.github.com>
Co-authored-by: Samuel Newman <mozzius@protonmail.com>
Conflict resolutions:
- package.json: take upstream @atproto/api 0.20.11, keep our OAuth deps
- ageAssurance/util.ts: take upstream (constants moved to const.ts,
  maybeRestrictChatSettings replaced by new restrictChatSettings API)
- ageAssurance/const.ts: re-apply fork divergence (fallback region
  config grants Full access by default)
- ageAssurance/state.ts: keep mu fork declared-age gating, adapt to
  upstream's data->metadata rename, import MIN_ACCESS_AGE from const
- ageAssurance/data.tsx: keep mu-age-service backend, take upstream's
  AgeAssuranceMetadata context shape
- NoAccessScreen.tsx: take upstream's metadata rename, keep fork's
  always-allowed birthdate declaration
- messages.po: union merge + dedupe (nightly CI re-extracts)
- pnpm-lock.yaml: regenerated via pnpm install

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@flo-bit
flo-bit merged commit f9854db into eurosky/fork Jun 10, 2026
12 checks passed
@github-actions

Copy link
Copy Markdown
Old size New size Diff
8.14 MB 8.18 MB 35.71 KB (0.43%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants