Skip to content

feat: sync develop fixes into main - #87

Merged
Alimedhat000 merged 1 commit into
mainfrom
merge/develop-into-main
Aug 25, 2026
Merged

feat: sync develop fixes into main#87
Alimedhat000 merged 1 commit into
mainfrom
merge/develop-into-main

Conversation

@Alimedhat000

Copy link
Copy Markdown
Owner

Summary

Squash-merge of develop (15 commits) onto main, 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 ✓

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.
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.

1 participant