feat: sync develop fixes into main - #87
Merged
Merged
Conversation
Squash-merge of develop (15 commits) onto main: Security/fixes: - Yjs as sole writer of Document.content (#86) - Scope collaboration request decisions to route document (#85) - Accept email when adding collaborators (#80) - Fix stale 'view' share link on permission switch (#78) - Fix deleting shared documents (FK RESTRICT) (#77) - Re-land WS authentication + exact-ID document resolution (#74) Features/chore: - Rate-limit auth endpoints (#79) - Client quality passes a-f: infra, structure, rules, seams, stories, CI (#66-#73) - Remove leftover debug console.log calls (#75) Conflicts resolved in favor of develop's supersets (collaborators dropdown/stories/toolbar, use-collaborators hook, document tests); pnpm-lock.yaml regenerated.
This was referenced Aug 25, 2026
Closed
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
Squash-merge of
develop(15 commits) ontomain, resolving conflicts in a single pass.Security / fixes
Features / chore
Conflict resolution
Develop's side taken where it superseded main (collaborators dropdown/stories/toolbar, use-collaborators hook, document tests); pnpm-lock.yaml regenerated via
pnpm install.Validation
pnpm lint✓pnpm typecheck✓pnpm build✓pnpm --filter server test— 57/57 ✓