Skip to content

Merge commercial app lifecycle and notebook refactors - #62

Merged
htommr merged 4 commits into
text2future:mainfrom
htommr:commercial-main-sync
Oct 18, 2026
Merged

htommr merged 4 commits into
text2future:mainfrom
htommr:commercial-main-sync

Conversation

@htommr

@htommr htommr commented Oct 18, 2026

Copy link
Copy Markdown
Contributor

Summary

  • Merge the three committed changes from text2future/flowix-commercial main into the current open-source main.
  • Includes the commercial snapshot preparation, context-menu test coverage, and app lifecycle/notebook refactors across core, desktop, web, and docs.
  • Resolve the overlapping document/editor files while retaining the attachment ownership fix already on open-source main.

Validation

  • git diff --check passed.
  • Tests were not run.

# Conflicts:
#	app/flowix-web/features/document/components/document-container.session.test.tsx
#	app/flowix-web/features/document/components/document-container.tsx
#	app/flowix-web/features/editor/extensions/attachment-link/index.ts
#	app/flowix-web/features/editor/extensions/attachment-link/upload/commands.ts
#	app/flowix-web/features/editor/extensions/attachment-link/upload/plugin.ts
#	app/flowix-web/features/editor/extensions/paste-rules/index.ts
#	app/flowix-web/features/editor/markdown-editor.tsx
@htommr
htommr merged commit ce67449 into text2future:main Oct 18, 2026
0 of 3 checks passed
@htommr
htommr deleted the commercial-main-sync branch October 18, 2026 14:40
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