Feature/resolve all conflicts final#56

Merged

Tamir26 merged 58 commits into

mainfrom

feature/resolve-all-conflicts-final

Mar 19, 2026

Commits on Mar 14, 2026

Commits on Mar 15, 2026

Feature/UI and auth fixes (#33) (#34)
Tamir26
authored
Resolve merge conflict in AuthSuccess.tsx - use refreshProfile from main
Tamir26
committed
Fix profile image fallback, fix Layout syntax, add DD-MM-YY-HH-mm to PR title (#37) (#38)
Tamir26
authored

Commits on Mar 17, 2026

Release: Merge main into production [17-03-26-10-07] (#40)
Tamir26
authored
Release: Merge main into production [17-03-26-10-20] (#42)
Tamir26
authored
Release: Merge main into production [17-03-26-13-37] (#44)
Tamir26
authored
Secure public user profiles by omitting emails and refresh tokens from external API calls
Tamir26
committed
Release: Merge main into production [17-03-26-15-15] (#46)
Tamir26
authored
feat: improve user search intent and expose Swagger/Jest UI
Tamir26
committed
feat: add mock data seeding script
Tamir26
committed
Release: Merge main into production [17-03-26-17-58] (#48)
Tamir26
authored
feat: fix production seeding and UI document persistence
Tamir26
committed
feat: finalize production-standard project structure for professor review
Tamir26
committed
chore: resolve merge conflicts with main
Tamir26
committed
chore: finalize merge of feature fixes into main
Tamir26
committed
Merge remote-tracking branch 'origin/main' into feature/fix-ui-and-seeding
Tamir26
committed
chore: resolve conflicts and merge feature fixes directly into production
Tamir26
committed
fix: update CSP to allow external images for mock data
Tamir26
committed
fix: move swagger and test-report routes before SPA fallback
Tamir26
committed
fix: restore swagger endpoints in production and resolve test timeouts in CI
Tamir26
committed
Merge branch 'production'
Tamir26
committed
fix: ensure swagger paths are absolute and automate post-deploy test refresh
Tamir26
committed
fix: ignore stale test reports and increase test setup timeouts
Tamir26
committed
fix: secure and automate test report refresh in production
Tamir26
committed
fix: remove stale local test report from repository
Tamir26
committed
fix: run tests during docker build stage to generate report reliably
Tamir26
committed
fix: relocate tests to host runner and increase timeouts to 60s for stability
Tamir26
committed
fix: enable pending AI tests by ensuring ENV and secrets are passed to host runner
Tamir26
committed
fix: update AI tests to run if either Gemini or OpenRouter key is present
Tamir26
committed
fix: make AI service key validation more flexible and add production referer
Tamir26
committed
fix: enable experimental-vm-modules for AI test compatibility and switch to jest.config.js
Tamir26
committed
fix: implement robust Avatar component and ensure horizontal navbar layout
Tamir26
committed
fix: restore missing imports and final UI layout tweaks
Tamir26
committed
refactor: split deployment into test and deploy jobs, and improve avatar resilience
Tamir26
committed
fix: add missing useEffect import for Avatar resilience
Tamir26
committed
fix: make OAuth initialization optional and provide secrets to CI test job
Tamir26
committed
fix: include Google OAuth secrets in test job environment
Tamir26
committed
feat: implement professional split-stage pipeline, OAuth resilience, and premium avatar styling
Tamir26
committed
fix: migrate PostDetails and UserProfile to Avatar component
Tamir26
committed
fix: refine navbar layout and hide profile dropdown caret
Tamir26
committed

Commits on Mar 18, 2026

Commits on Mar 19, 2026