Commit Graph

109 Commits

Author SHA1 Message Date
b4891101e7 Merge pull request 'refactor: restructure home model and update homeController' (#22) from fea/thanh-02022026-news into main
Reviewed-on: UKSOURCE/cms.hailearning.edu.vn#22
2026-02-05 06:26:13 +00:00
589201ff35 Merge pull request 'fea Visa-VisaDetail' (#21) from fea/hoang-04022026-Visa/VisaDetail into main
Reviewed-on: UKSOURCE/cms.hailearning.edu.vn#21
2026-02-05 06:25:12 +00:00
Wini_Fy
aea70f89ac refactor: restructure home model and update homeController 2026-02-05 13:24:07 +07:00
r2xrzh9q2z-lab
ae468e7f26 fea Visa-VisaDetail 2026-02-05 12:49:59 +07:00
c3a55b13f8 Merge pull request 'fea/thanh-02022026-news' (#20) from fea/thanh-02022026-news into main
Reviewed-on: UKSOURCE/cms.hailearning.edu.vn#20
2026-02-05 04:01:54 +00:00
Wini_Fy
08061232dd refactor: update primary color scheme and remove camp location functionality from admin routes and views 2026-02-05 10:59:44 +07:00
Wini_Fy
7ba051ffc5 Merge branch 'main' of https://gits.techvanguard.vn/UKSOURCE/cms.hailearning.edu.vn into fea/thanh-02022026-news 2026-02-05 10:54:30 +07:00
Wini_Fy
7dd52d8669 refactor: remove camp location functionality 2026-02-05 10:52:27 +07:00
63a233cb11 Merge pull request 'fix/huy-04022026-fix-headermenu' (#19) from fix/huy-04022026-fix-headermenu into main
Reviewed-on: UKSOURCE/cms.hailearning.edu.vn#19
2026-02-05 02:18:52 +00:00
446f28cca1 Merge pull request 'feat/huy-03022026-add-headermenu-api-crud-management' (#18) from feat/huy-03022026-add-headermenu-api-crud-management into main
Reviewed-on: UKSOURCE/cms.hailearning.edu.vn#18
2026-02-05 02:17:52 +00:00
1150156556 feat: Refactor header menu and social link controllers to use RESTful method names, remove social link API routes, and add comprehensive social link management to admin routes. 2026-02-05 02:00:38 +07:00
f25f6b9156 add api headermenu and crud management 2026-02-05 01:42:40 +07:00
befe6b30aa feat(header): add admin UI and APIs for header management 2026-02-05 01:31:51 +07:00
00f93cefab Merge pull request 'fix/bao-04022026-1625-service-management' (#17) from fix/bao-04022026-1625-service-management into main
Reviewed-on: UKSOURCE/cms.hailearning.edu.vn#17
2026-02-04 09:27:48 +00:00
nguyenvanbao
6294920e68 fix: add leading slashes to image paths in service data 2026-02-04 16:25:54 +07:00
017d886906 Merge pull request 'fea/thanh-02022026-news' (#16) from fea/thanh-02022026-news into main
Reviewed-on: UKSOURCE/cms.hailearning.edu.vn#16
2026-02-04 09:23:00 +00:00
Wini_Fy
01d315afb8 refactor: enhance admin dashboard and layout with blog management links 2026-02-04 16:03:28 +07:00
Wini_Fy
3e1e6d0a87 Merge branch 'main' of https://gits.techvanguard.vn/UKSOURCE/cms.hailearning.edu.vn into fea/thanh-02022026-news 2026-02-04 15:46:59 +07:00
Wini_Fy
12e7edc9a7 feat: Integrate MongoDB session store for improved session management 2026-02-04 15:46:36 +07:00
f8c77855c7 Merge pull request 'feat: Enhance comment management functionality in blog module' (#15) from fea/thanh-02022026-news into main
Reviewed-on: UKSOURCE/cms.hailearning.edu.vn#15
2026-02-04 08:37:50 +00:00
Wini_Fy
6dcfd19432 feat: Enhance comment management functionality in blog module 2026-02-04 15:33:34 +07:00
nguyenvanbao
c67ed49a03 Merge branch 'main' of https://gits.techvanguard.vn/UKSOURCE/cms.hailearning.edu.vn into fix/bao-04022026-service-management 2026-02-04 14:34:30 +07:00
b795a07b8c Merge pull request 'update API v3' (#14) from fea/hoang-04022026-Visa/VisaDetail into main
Reviewed-on: UKSOURCE/cms.hailearning.edu.vn#14
2026-02-04 07:33:23 +00:00
r2xrzh9q2z-lab
8d85331e12 update API v3 2026-02-04 14:32:27 +07:00
nguyenvanbao
81621154e5 Merge branch 'main' of https://gits.techvanguard.vn/UKSOURCE/cms.hailearning.edu.vn into fix/bao-04022026-service-management 2026-02-04 14:22:20 +07:00
91f10b251e Merge pull request 'update API Country V2' (#13) from fea/hoang-04022026-Visa/VisaDetail into main
Reviewed-on: UKSOURCE/cms.hailearning.edu.vn#13
2026-02-04 07:21:32 +00:00
r2xrzh9q2z-lab
5bf6226df7 update API Country V2 2026-02-04 14:20:24 +07:00
nguyenvanbao
39c0a87a0e Merge branch 'main' of https://gits.techvanguard.vn/UKSOURCE/cms.hailearning.edu.vn into fix/bao-04022026-service-management 2026-02-04 14:04:04 +07:00
ff22fe1c8c Merge pull request 'route' (#12) from fea/hoang-04022026-Visa/VisaDetail into main
Reviewed-on: UKSOURCE/cms.hailearning.edu.vn#12
2026-02-04 07:03:08 +00:00
r2xrzh9q2z-lab
aa92331f04 route 2026-02-04 14:01:44 +07:00
nguyenvanbao
d6cf846b6e Merge branch 'main' of https://gits.techvanguard.vn/UKSOURCE/cms.hailearning.edu.vn into fix/bao-04022026-service-management 2026-02-04 14:00:14 +07:00
7b91ee5f50 Merge pull request 'update API Country' (#11) from fea/hoang-04022026-Visa/VisaDetail into main
Reviewed-on: UKSOURCE/cms.hailearning.edu.vn#11
2026-02-04 06:59:54 +00:00
r2xrzh9q2z-lab
8d38b6db56 update API Country 2026-02-04 13:57:23 +07:00
nguyenvanbao
fa2452d42f Merge branch 'main' of https://gits.techvanguard.vn/UKSOURCE/cms.hailearning.edu.vn into fix/bao-04022026-service-management 2026-02-04 13:34:10 +07:00
nguyenvanbao
7e50772f3f style: resolve merge conflicts and format admin routes 2026-02-04 13:32:35 +07:00
6d2957a51a Merge pull request 'API Country' (#10) from fea/hoang-04022026-Visa/VisaDetail into main
Reviewed-on: UKSOURCE/cms.hailearning.edu.vn#10
2026-02-04 06:21:53 +00:00
r2xrzh9q2z-lab
85f6295824 API Country 2026-02-04 13:12:20 +07:00
050f6b7776 Merge pull request 'fix: enhance FAQ management and add delete confirmation modal' (#9) from fix/bao-04022026-service-management into main
Reviewed-on: UKSOURCE/cms.hailearning.edu.vn#9
2026-02-04 04:55:06 +00:00
nguyenvanbao
7115cb735a Merge branch 'main' of https://gits.techvanguard.vn/UKSOURCE/cms.hailearning.edu.vn into fix/bao-04022026-service-management 2026-02-04 11:50:51 +07:00
nguyenvanbao
37123976c6 fix: enhance FAQ management and add delete confirmation modal 2026-02-04 11:48:04 +07:00
d2d5f53f1d Merge pull request 'fea/hoang-04022026-Visa/VisaDetail' (#7) from fea/hoang-04022026-Visa/VisaDetail into main
Reviewed-on: UKSOURCE/cms.hailearning.edu.vn#7
2026-02-04 02:36:10 +00:00
r2xrzh9q2z-lab
2563ddf5ee fix conflig pull request 2026-02-04 09:26:50 +07:00
a255d09ef0 Merge pull request 'fea/thanh-02022026-news' (#5) from fea/thanh-02022026-news into main
Reviewed-on: UKSOURCE/cms.hailearning.edu.vn#5
2026-02-04 02:23:07 +00:00
Wini_Fy
c098043b44 Merge branch 'main' of https://gits.techvanguard.vn/UKSOURCE/cms.hailearning.edu.vn into fea/thanh-02022026-news 2026-02-04 09:22:24 +07:00
r2xrzh9q2z-lab
25df84fe8c Fix merge conflicts with main 2026-02-04 09:21:15 +07:00
12cda86757 Merge pull request 'feat: add service management module with CRUD operations' (#4) from fea/bao-03022026-Admin-Management-Service into main
Reviewed-on: UKSOURCE/cms.hailearning.edu.vn#4
2026-02-04 02:19:12 +00:00
nguyenvanbao
a1984189bd Merge branch 'main' of https://gits.techvanguard.vn/UKSOURCE/cms.hailearning.edu.vn into fea/bao-03022026-Admin-Management-Service 2026-02-04 09:18:42 +07:00
r2xrzh9q2z-lab
6f82b2c35c UI Visa-VisaDetail 2026-02-04 09:17:57 +07:00
5e2e949285 Merge pull request 'feat: Implement core admin panel functionalities including appointment, contact, and pricing management with associated models, controllers, views, and routes.' (#2) from hoanganh-03022026-appointment-contact-pricing into main
Reviewed-on: UKSOURCE/cms.hailearning.edu.vn#2
2026-02-03 15:36:44 +00:00
Wini_Fy
8ceb5684e4 fix: Improve formatting and spacing in blog edit and index pages 2026-02-03 17:04:54 +07:00