sync upstream 1.124#52
Merged
Merged
Conversation
Co-authored-by: Samuel Newman <mozzius@protonmail.com>
Co-authored-by: Samuel Newman <mozzius@protonmail.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: Eric Bailey <git@esb.lol>
Co-authored-by: Samuel Newman <mozzius@protonmail.com>
…ial#10801) Co-authored-by: Samuel Newman <mozzius@protonmail.com>
Co-authored-by: Eric Bailey <git@esb.lol> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
…ocial#10834) Co-authored-by: Claude Fable 5 <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>
…sky-social#10839) Co-authored-by: Claude Fable 5 <noreply@anthropic.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>
|
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.
No description provided.