fea/nhat-13042026-merge-kiet-thien #6

Closed
minhnhat wants to merge 12 commits from fea/nhat-13042026-merge-kiet-thien into main

12 Commits

Author SHA1 Message Date
691d655b69 Merge pull request 'refactor: merge code and update main.css, delete file css in component' (#5) from fea/nhat-13042026-fe-home-about into fea/nhat-13042026-merge-kiet-thien
Reviewed-on: #5
2026-04-14 19:34:05 +00:00
Đỗ Minh Nhật
f00283dfe1 refactor: merge code and update main.css, delete file css in component 2026-04-15 02:32:40 +07:00
8af38b8ae2 Merge pull request 'fea/thien-14042026-fe-publications-research' (#4) from fea/thien-14042026-fe-publications-research into fea/nhat-13042026-merge-kiet-thien
Reviewed-on: #4
2026-04-14 17:39:54 +00:00
VuHoangThien
45ba12e41e feat: complete publications and research sections and resolve conflicts 2026-04-14 23:51:53 +07:00
VuHoangThien
a7356cdb7a fix: resolve merge conflict in globals.css 2026-04-14 23:43:14 +07:00
f82c4626c1 Merge pull request 'feat: Create FE home page and about page' (#3) from fea/nhat-13042026-fe-home-about into fea/nhat-13042026-merge-kiet-thien
Reviewed-on: #3
2026-04-14 12:28:26 +00:00
Đỗ Minh Nhật
637846a80c feat: Create FE home page and about page 2026-04-14 19:28:35 +07:00
13a281b8c8 Merge pull request 'feat: add Contact and Accreditation pages' (#2) from fea/kiet-13042026-fe-contactus-accreditaton into fea/nhat-13042026-merge-kiet-thien
Reviewed-on: #2
2026-04-14 09:05:29 +00:00
hkiett265
10103806bb feat: add Contact and Accreditation pages 2026-04-14 16:00:11 +07:00
15a0b8824a Merge pull request 'fea/kiet-13042026-fe-partnerships-blog' (#1) from fea/kiet-13042026-fe-partnerships-blog into fea/nhat-13042028-merge-kiet-thien
Reviewed-on: #1
2026-04-14 08:51:10 +00:00
hkiett265
4bfad8481b feat: create Partnership and Blog functional components 2026-04-14 11:40:55 +07:00
hkiett265
ad68b7d8c4 feat: create Partnership component and styles 2026-04-13 22:15:20 +07:00