No description
Find a file
Manish Tanwar e0cc56fc6e Merge main into feature/deployment: new features + conflict resolution
New features from main:
- Custom presets (create, edit, export/import)
- Identity protection (auto-translate real names to style descriptions)
- Video negative prompts (AI-suggested exclusions)
- Generate video from library image (one-click first frame)
- Expanded preview (maximize on images/videos)
- Move items between projects
- Preset badge in library
- 4K resolution option for Veo 3.1 (8s duration)
- LastFrame interpolation requires 8s (enforced in UI + API)

Conflict resolutions:
- main.jsx: kept feature/deployment AuthProvider+MsalProvider structure
- LoginPage.jsx: kept feature/deployment useAuth() context approach
- useProjects.js: kept feature/deployment AuthContext userId
- CinePromptStudio.jsx: kept both getApiUrl + useCustomPresets imports
- ProjectsTab.jsx: took main's expanded icon set
- VideoGenTab.jsx: took main's duration/resolution logic improvements
- video_api.php: took main's 8s constraint + better error logging

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
2026-02-25 17:49:15 +05:30
.claude Merge main into feature/deployment: new features + conflict resolution 2026-02-25 17:49:15 +05:30
backend Merge main into feature/deployment: new features + conflict resolution 2026-02-25 17:49:15 +05:30
frontend Merge main into feature/deployment: new features + conflict resolution 2026-02-25 17:49:15 +05:30
.gitignore Merge main into feature/deployment: new features + conflict resolution 2026-02-25 17:49:15 +05:30
.htaccess 4. Deployment Dist Folder+API Url 2026-02-05 18:03:34 +05:30
AI_IMPLEMENTATION_GUIDE.md 1. Minimum deployment codemarkdown for minimum changes 2026-02-05 00:24:03 +05:30
api.php.backup 1. Minimum deployment codemarkdown for minimum changes 2026-02-05 00:24:03 +05:30
AUTH_README.md 1. Minimum deployment codemarkdown for minimum changes 2026-02-05 00:24:03 +05:30
CLAUDE.md Merge main into feature/deployment: new features + conflict resolution 2026-02-25 17:49:15 +05:30
composer.json 1. Minimum deployment codemarkdown for minimum changes 2026-02-05 00:24:03 +05:30
composer.lock 1. Minimum deployment codemarkdown for minimum changes 2026-02-05 00:24:03 +05:30
DEPLOYMENT.md 6. Thumbnail and Video Streaming fix 2026-02-06 00:44:50 +05:30
INSTALL.md 1. Minimum deployment codemarkdown for minimum changes 2026-02-05 00:24:03 +05:30
QUICK_REFERENCE.md 1. Minimum deployment codemarkdown for minimum changes 2026-02-05 00:24:03 +05:30
video_api.php.backup 1. Minimum deployment codemarkdown for minimum changes 2026-02-05 00:24:03 +05:30