Skip to content

chore(release): align main with develop - #51

Merged
TUDONG05 merged 161 commits into
mainfrom
chore/sync-develop-main
Oct 18, 2026
Merged

chore(release): align main with develop#51
TUDONG05 merged 161 commits into
mainfrom
chore/sync-develop-main

Conversation

@TUDONG05

@TUDONG05 TUDONG05 commented Oct 18, 2026

Copy link
Copy Markdown
Owner

This PR aligns main with the authoritative develop state.

  • The resulting tree is byte-for-byte identical to current develop ($develop).
  • The merge commit preserves both develop and main histories without rewriting either branch.
  • This resolves the divergence introduced by the prior revert on main.
  • CI should validate the authoritative develop state before this PR is merged.

nguyentuyenhieu05-ui and others added 30 commits September 15, 2026 21:34
@nguyentuyenhieu05-ui
chore(infra): setup postgres minio rbac and ci pipeline
7fc2306
@nguyentuyenhieu05-ui
Merge branch 'develop' of https://github.com/TUDONG05/ITMS into featu…
5a3e2b2 
…re/s0-09-infra-security
@nguyentuyenhieu05-ui
fix(security): format import blocks for ruff linter
e512385
@nguyentuyenhieu05-ui
Merge pull request #1 from TUDONG05/feature/s0-09-infra-security
89a1e6b 
chore(infra): setup postgres minio rbac and ci pipeline
@nguyentuyenhieu05-ui
Revert "chore(infra): setup postgres minio rbac and ci pipeline"
55f7fd0
@nguyentuyenhieu05-ui
refactor(infra-security): resolve lead review feedback for s0-09 and …
27c3235 
…s0-10
@nguyentuyenhieu05-ui
Merge pull request #2 from TUDONG05/revert-1-feature/s0-09-infra-secu…
9cd9403 
…rity

Revert "chore(infra): setup postgres minio rbac and ci pipeline"
@nguyentuyenhieu05-ui
merge: resolve conflicts with develop
612ec01
@nguyentuyenhieu05-ui
fix(ci): update node.js version to 22 for angular cli compatibility
827345b
@TUDONG05
Merge pull request #3 from TUDONG05/feature/s0-09-infra-security
52bd62b 
refactor(infra-security): resolve lead review feedback for s0-09 and …
@TUDONG05
revert: undo PR #3 infra security changes
91e3aa9
@TUDONG05
fix(migration): align unique indexes with models
ce26853
@TUDONG05
Merge pull request #5 from TUDONG05/feat/s0-04-migration-api
0992946
@TUDONG05
feat(database): simplify itms schema to 20 tables
676df89
@TUDONG05
Merge pull request #6 from TUDONG05/feat/s0-04-migration-api
16b149c 
feat(database): simplify itms schema to 20 tables
@TUDONG05
feat(database): vietnamese schema identifiers
a3b8a9b
@TUDONG05
Merge pull request #7 from TUDONG05/feat/s0-04-migration-api
75c11e0 
feat(database): vietnamese schema identifiers
@TUDONG05
feat(auth): implement login use case
4bf4ca0
@TUDONG05
docs(readme): document login demo
4f3323c
@TUDONG05
fix(auth): align login with simplified schema
890b9c3
@TUDONG05
feat(auth): route users to role dashboards
21174d4
@TUDONG05
feat(auth): add account security lifecycle
1c59ffc
@TUDONG05
Merge pull request #9 from TUDONG05/feature/uc-1-4-account-security
0f987d3 
Feature/uc 1 4 account security
@TUDONG05
feat(dashboard): add ng-zorro role dashboard shell
e235273
@TUDONG05
chore(frontend): adjust ng-zorro bundle budget
fbc3940
@TUDONG05
feat(dashboard): integrate role-based ng-zorro workspace
1576fec
@TUDONG05
Merge pull request #11 from TUDONG05/feature/dashboard-shell
80f7261 
Feature/dashboard shell
@TUDONG05
feat(seed): add complete development dataset
e39048d
@TUDONG05
Merge pull request #12 from TUDONG05/feature/seed-system-data
aaccadf 
feat(seed): add complete development dataset
@TUDONG05
docs(readme): update project documentation
9718fff
tuannguyen7463 and others added 25 commits October 14, 2026 18:36
@tuannguyen7463
feat(evaluation): add criteria management and intern evaluations (UC-12)
5bd3b38
@TUDONG05
feat(assistant): add scoped data assistant API
2ef228e
@TUDONG05
feat(assistant): add secure chatbot interface
9a5b501
@TUDONG05
test(db): isolate committed test data
2900089
@TUDONG05
fix(assistant): report exact intern totals
4767918
@TUDONG05
feat(assistant): add notification lookup tool
37e8d9f
@TUDONG05
docs(assistant): document chatbot tools
703ad05
@TUDONG05
Merge pull request #43 from TUDONG05/feature/chatbot-assistant
b9fbf63 
feat(assistant): add RBAC-scoped ITMS chatbot
@TUDONG05
Merge pull request #42 from TUDONG05/feature/quanly-danhgia
67c2986 
feat(evaluation): add criteria management and intern evaluations (UC-12)
@TUDONG05
feat(ui): redesign role dashboards
6eb662c
@TUDONG05
fix(a11y): support keyboard account menu
3f24500
@TUDONG05
Merge pull request #44 from TUDONG05/fix/ui-redesign
22dffa1 
feat(ui): redesign role dashboards
@TUDONG05
fix(deps): add httpx for Vercel runtime
c38ecfd
@TUDONG05
Merge pull request #45 from TUDONG05/fix/ui-redesign
7265472 
fix(deps): add httpx for Vercel runtime
@TUDONG05
feat(frontend): unify responsive internship workflows
91a788b
@TUDONG05
Merge remote-tracking branch 'origin/develop' into fix/ui-redesign
3e67b42
@TUDONG05
Merge pull request #46 from TUDONG05/fix/ui-redesign
7fabd1e 
feat(frontend): unify responsive internship workflows
@TUDONG05
fix(profile): persist avatars in Vercel Blob
e0f61f9
@TUDONG05
Merge remote-tracking branch 'origin/develop' into fix/ui-redesign
993103b
@TUDONG05
Merge pull request #47 from TUDONG05/fix/ui-redesign
d5c4daa 
fix(profile): persist avatars in Vercel Blob
@NguyenVietMinh2005
fix(admin): fix admin navigation, email validation, and responsive UI
189962a
@TUDONG05
Merge pull request #48 from TUDONG05/fix/admin-features-responsive
2728573 
fix(admin): fix admin navigation, email validation, and responsive UI
@TUDONG05
docs(readme): refresh project documentation
ac3bf22
@TUDONG05
Merge pull request #49 from TUDONG05/docs/update-readme
8f24efb 
docs(readme): refresh project documentation
@TUDONG05
chore(release): align main history with develop
d40ad99
@vercel

vercel Bot commented Oct 18, 2026 •
edited
Loading

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated
itms Ready Ready Preview Oct 18, 2026 5:14am UTC
itms-two Ready Ready Preview Oct 18, 2026 5:14am UTC

@TUDONG05 TUDONG05 mentioned this pull request Oct 18, 2026
Closed
2 tasks
@TUDONG05
TUDONG05 merged commit b4297ca into main Oct 18, 2026
5 checks passed

This branch was successfully deployed

2 active deployments
Preview – itms — d40ad992 Deployed Oct 18, 2026 by vercel[bot]
View deployment
Preview – itms-two — d40ad992 Deployed Oct 18, 2026 by vercel[bot]
View deployment
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@TUDONG05 @nguyentuyenhieu05-ui @Thinh-25 @NguyenVietMinh2005 @tuannguyen7463