Commits · 902a858fb7ac6e92fbba6def7094a51bb4adb05f · Văn Hoàng / VCCI-News

05 Nov, 2025 16 commits
- fix/scroll to top, detail news category · 902a858f
  Phạm Quang Bảo authored Nov 05, 2025
  
  902a858f
- fix/scroll to top, detail news category · 9987245a
  Phạm Quang Bảo authored Nov 05, 2025
  
  9987245a
- update component filter · dbcd6907
  Vũ Đình Nguyên authored Nov 05, 2025
  
  dbcd6907
- Merge branch 'fix/home_page' into 'develop' · ee2ee642
  Vũ Đình Nguyên authored Nov 05, 2025
```
fix/home_page-and-fix-footer

See merge request !12
```
  ee2ee642
- Merge branch 'develop' into fix/home_page · 4b74d1b8
  Phạm Quang Bảo authored Nov 05, 2025
  
  4b74d1b8
- Merge branch 'develop' into fix/home_page · a99fbda4
  Phạm Quang Bảo authored Nov 05, 2025
  
  a99fbda4
- Merge branch 'fix/calender_component' into 'develop' · 75098072
  Vũ Đình Nguyên authored Nov 05, 2025
```
update/get api and fix design

See merge request !13
```
  75098072
- update/get api and fix design · ae2b20d2
  Phạm Quang Bảo authored Nov 05, 2025
  
  ae2b20d2
- fix/home_page-and-fix/footer · 7e62d507
  Phan Ngọc Quốc Văn authored Nov 05, 2025
  
  7e62d507
- Merge branch 'tumlumtumla' into 'develop' · 3a744f98
  Phạm Quang Bảo authored Nov 05, 2025
```
Tumlumtumla

See merge request !11
```
  3a744f98
- Merge branch 'feat/home_page' into tumlumtumla · b9ec0614
  Phạm Quang Bảo authored Nov 05, 2025
  
  b9ec0614
- Merge branch 'tumlumtumla' into feat/home_page · 2ce89c19
  Phạm Quang Bảo authored Nov 05, 2025
  
  2ce89c19
- Merge branch 'tumlumtumla' into 'develop' · 5ca290c8
  Vũ Đình Nguyên authored Nov 05, 2025
```
Tumlumtumla

See merge request !9
```
  5ca290c8
- Merge branch 'develop' into 'tumlumtumla' · 695425f5
  Vũ Đình Nguyên authored Nov 05, 2025
```
# Conflicts:
#   src/app/(main)/_lib/layout/header.tsx
#   src/app/(main)/thong-tin-truyen-thong/an-pham/page.tsx
```
  695425f5
- update loading · 33fcbbfb
  Phạm Quang Bảo authored Nov 05, 2025
  
  33fcbbfb
- update layout · 74a04b88
  Vũ Đình Nguyên authored Nov 05, 2025
  
  74a04b88
04 Nov, 2025 20 commits
- update api · 6c996526
  Vũ Đình Nguyên authored Nov 04, 2025
  
  6c996526
- . · fd08a77c
  Phạm Quang Bảo authored Nov 04, 2025
  
  fd08a77c
- update/fallback image · 48de7805
  Phạm Quang Bảo authored Nov 04, 2025
  
  48de7805
- a · a7f86fcb
  Phạm Quang Bảo authored Nov 04, 2025
  
  a7f86fcb
- Merge branch 'feat/publication_page' into 'develop' · cbfd9322
  Vũ Đình Nguyên authored Nov 04, 2025
```
Feat/publication page

See merge request !7
```
  cbfd9322
- Merge branch 'develop' into 'feat/publication_page' · 714019d8
  Vũ Đình Nguyên authored Nov 04, 2025
```
# Conflicts:
#   src/app/(main)/_lib/layout/MenuItem.tsx
#   src/app/(main)/thong-tin-truyen-thong/an-pham/page.tsx
#   src/components/base/list-category/index.tsx
```
  714019d8
- Merge branch 'feat/home_page' into 'develop' · 227363b8
  Vũ Đình Nguyên authored Nov 04, 2025
```
Feat/home page

See merge request !8
```
  227363b8
- update/add event into page · e83b5a22
  Phạm Quang Bảo authored Nov 04, 2025
  
  e83b5a22
- feat/publication_page · 9625caf9
  Phan Ngọc Quốc Văn authored Nov 04, 2025
  
  9625caf9
- update/layout page · c2d14537
  Phạm Quang Bảo authored Nov 04, 2025
  
  c2d14537
- fix(layout-all-page): fix layout all page · 4d628084
  Vũ Đình Nguyên authored Nov 04, 2025
  
  4d628084
- Merge branch 'feat/general_page' into 'develop' · eabc5f4d
  Vũ Đình Nguyên authored Nov 04, 2025
```
update/final page

See merge request !6
```
  eabc5f4d
- update/final page · 45d864f3
  Phạm Quang Bảo authored Nov 04, 2025
  
  45d864f3
- fix/header-link-finally · 702e56b2
  Phan Ngọc Quốc Văn authored Nov 04, 2025
  
  702e56b2
- fix/header_link · 677742fd
  Phan Ngọc Quốc Văn authored Nov 04, 2025
  
  677742fd
- Merge branch 'feat/home_page' into 'develop' · 3ce24867
  Vũ Đình Nguyên authored Nov 04, 2025
```
Feat/home page

See merge request !5
```
  3ce24867
- Merge branch 'develop' into 'feat/home_page' · b9ca187b
  Văn Hoàng authored Nov 04, 2025
```
# Conflicts:
#   src/app/(main)/hoi-vien/ket-noi-hoi-vien/page.tsx
#   src/app/(main)/hoi-vien/tin-hoi-vien/page.tsx
```
  b9ca187b
- fix/responsive · ba2bcf3b
  Phạm Quang Bảo authored Nov 04, 2025
  
  ba2bcf3b
- Merge branch 'feature/product_origin_page' into 'develop' · fc8def4e
  Vũ Đình Nguyên authored Nov 04, 2025
```
feature/product_origin_page

See merge request !4
```
  fc8def4e
- feat(page-representatives-employers): creat page-representatives employers · 7081e8df
  Vũ Đình Nguyên authored Nov 04, 2025
  
  7081e8df
03 Nov, 2025 4 commits
- add images and update member · b9767418
  Phạm Quang Bảo authored Nov 03, 2025
  
  b9767418
- feat(layout-page): creat page layout page · 8c3aefaa
  Vũ Đình Nguyên authored Nov 03, 2025
  
  8c3aefaa
- feature/product_origin_page · 5589d1b5
  Phan Ngọc Quốc Văn authored Nov 03, 2025
  
  5589d1b5
- Merge branch 'feature/home_page-and-members_page' into 'develop' · c61429cb
  Vũ Đình Nguyên authored Nov 03, 2025
```
Feature/home page and members page

See merge request !3
```
  c61429cb