mirror of
https://github.com/Frooodle/Stirling-PDF.git
synced 2025-12-18 20:04:17 +01:00
Resolved conflicts by: - Kept invite link feature (inviteLinkExpiryHours in ApplicationProperties) - Kept enhanced email invite validation (both SMTP and invites enabled check) - Adopted V2's Posthog/Scarf tracking additions - Adopted V2's password length validation (min 6 chars) on both backend and frontend - Converted email templates to Java text blocks - Kept success message functionality in Login flow - Used @app path aliases consistently across frontend files - Fixed remaining relative imports in Workbench, RestartConfirmationModal, useRestartServer, and InviteAccept - Accepted deletion of refactored files (App.tsx, Landing.tsx, etc.) - Kept InviteAccept.tsx for invite link feature |
||
|---|---|---|
| .. | ||
| common | ||
| core | ||
| proprietary | ||
| allowed-licenses.json | ||