 joseph
|
230beb4ed7
|
Merge pull request 'fix search, show file' (#119) from vi.document into dev
Reviewed-on: #119
|
2025-03-14 18:30:52 +11:00 |
dbdbd9
|
60925a83af
|
fix search, show file
|
2025-03-14 14:26:57 +07:00 |
|
joseph
|
b6476feae5
|
Merge pull request 'dev' (#118) from dev into master
Reviewed-on: #118
|
2025-03-14 14:52:35 +11:00 |
|
joseph
|
8b9e18bdcb
|
Merge pull request 'adjust Create, Update logic, add permission' (#117) from vi.document into dev
Reviewed-on: #117
|
2025-03-14 14:47:05 +11:00 |
|
dbdbd9
|
4896461838
|
Merge branch 'dev' of https://gitea.nswteam.net/joseph/ManagementSystem into vi.document
|
2025-03-14 10:07:16 +07:00 |
|
dbdbd9
|
7ef2897469
|
Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into vi.document
|
2025-03-14 10:07:11 +07:00 |
|
dbdbd9
|
88870e075c
|
adjust Create, Update logic, add permission
|
2025-03-14 10:06:49 +07:00 |
|
joseph
|
008c335b79
|
Merge pull request 'fix library type' (#115) from vi.document into dev
Reviewed-on: #115
|
2025-03-13 20:45:38 +11:00 |
Truong Vo
|
650cfe1b13
|
[Ngày Phép] Cập nhật loại phép nộp: WFH, Nghỉ phép năm, Nghỉ không lương
|
2025-03-13 15:41:43 +07:00 |
|
dbdbd9
|
20745381db
|
fix lib type
|
2025-03-13 15:09:22 +07:00 |
|
Truong Vo
|
8ce0d957b1
|
[Ngày Phép] Cập nhật lại tên cột cho bảng ngày nghỉ phép năm
|
2025-03-13 14:54:37 +07:00 |
|
joseph
|
a5ece4d65d
|
Merge pull request 'dev' (#114) from dev into master
Reviewed-on: #114
|
2025-03-13 18:53:52 +11:00 |
|
joseph
|
d8cbb7e01b
|
Merge pull request 'BE, FE Document' (#113) from vi.document into dev
Reviewed-on: #113
|
2025-03-13 18:53:32 +11:00 |
|
Truong Vo
|
86f2bb12fc
|
[Ngày Phép] Cập nhật lại tên cột cho bảng ngày nghỉ phép năm
|
2025-03-13 14:50:57 +07:00 |
|
dbdbd9
|
78bdca4e23
|
update permission
|
2025-03-13 14:48:26 +07:00 |
|
dbdbd9
|
e026b70e66
|
fix show file document detail, update document
|
2025-03-13 14:14:43 +07:00 |
|
dbdbd9
|
0c5f56d30c
|
add BE, FE Document
|
2025-03-12 16:48:05 +07:00 |
Joseph
|
2561d39b4a
|
update ignore project
|
2025-02-21 15:52:03 +07:00 |
|
joseph
|
12a1447931
|
Merge pull request 'dev' (#112) from dev into master
Reviewed-on: #112
|
2025-02-21 19:23:55 +11:00 |
|
joseph
|
35ecaa802d
|
Merge pull request 'truong-frame-drawio' (#111) from truong-frame-drawio into dev
Reviewed-on: #111
|
2025-02-21 19:23:35 +11:00 |
|
Truong Vo
|
1018172b58
|
Merge branch 'master' into dev
|
2025-02-21 11:12:15 +07:00 |
|
Truong Vo
|
0ebe4c772e
|
Bổ sung biểu đồ drawio cho trang allocation
|
2025-02-21 11:11:37 +07:00 |
|
Truong Vo
|
281c8ad98a
|
Bổ sung biểu đồ drawio cho trang allocation
|
2025-02-21 10:51:27 +07:00 |
|
joseph
|
a2e36501bb
|
Merge pull request 'Update StaffEvaluation.tsx' (#110) from that-fe into master
Reviewed-on: #110
|
2025-02-17 20:40:24 +11:00 |
nguentrungthat
|
04ee5e4081
|
Merge branch 'master' into that-fe
|
2025-02-17 16:40:14 +07:00 |
|
nguentrungthat
|
15880f8bd1
|
Update StaffEvaluation.tsx
|
2025-02-17 16:39:35 +07:00 |
|
joseph
|
6c5b2d8412
|
Merge pull request 'Update view detail Working review' (#109) from that-fe into master
Reviewed-on: #109
|
2025-02-17 20:30:32 +11:00 |
|
nguentrungthat
|
f5e4d7b405
|
Update view detail Working review
|
2025-02-17 16:14:52 +07:00 |
|
joseph
|
5cfd78d2c0
|
Merge pull request 'Update check working' (#108) from that-fe into master
Reviewed-on: #108
|
2025-02-17 13:28:07 +11:00 |
|
nguentrungthat
|
2bda35d8d3
|
Merge branch 'master' into that-fe
|
2025-02-14 16:53:26 +07:00 |
|
nguentrungthat
|
be6d7be79e
|
Update check working
|
2025-02-14 16:51:46 +07:00 |
|
joseph
|
f60be27969
|
Merge pull request 'Update select query' (#107) from that-fe into master
Reviewed-on: #107
|
2025-02-14 19:57:17 +11:00 |
|
nguentrungthat
|
73edecf341
|
Update select query
|
2025-02-14 10:49:12 +07:00 |
|
nguentrungthat
|
13a477e883
|
Update TrackingController.php
|
2025-02-14 10:44:42 +07:00 |
|
joseph
|
471cc0eb2a
|
Merge pull request 'Update' (#106) from that-fe into master
Reviewed-on: #106
|
2025-02-14 14:35:08 +11:00 |
|
nguentrungthat
|
1887f2805f
|
Merge branch 'master' into that-fe
|
2025-02-14 09:43:56 +07:00 |
|
nguentrungthat
|
bb12c55ef6
|
Update TrackingController.php
|
2025-02-14 09:43:21 +07:00 |
|
nguentrungthat
|
49b681566d
|
fix
|
2025-02-14 09:42:08 +07:00 |
|
joseph
|
9b472544b6
|
Merge pull request 'Update Working review' (#105) from that-fe into master
Reviewed-on: #105
|
2025-02-14 12:22:28 +11:00 |
|
nguentrungthat
|
5cdfaafe03
|
fic build
|
2025-02-14 08:03:05 +07:00 |
|
nguentrungthat
|
8107978a42
|
Merge branch 'master' into that-fe
|
2025-02-14 07:47:03 +07:00 |
|
nguentrungthat
|
846df81d44
|
Update Working review
|
2025-02-13 17:01:52 +07:00 |
|
joseph
|
5165ded25e
|
Merge pull request 'Update' (#104) from that-fe into master
Reviewed-on: #104
|
2025-02-07 19:32:13 +11:00 |
|
nguentrungthat
|
7ce7251097
|
Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into that-fe
|
2025-02-07 15:31:40 +07:00 |
|
nguentrungthat
|
f05334ea34
|
Update
|
2025-02-07 15:23:03 +07:00 |
|
joseph
|
4d94e26bb9
|
Merge pull request 'master' (#103) from master into dev
Reviewed-on: #103
|
2025-02-07 19:00:27 +11:00 |
|
joseph
|
fc6587bcff
|
Merge pull request 'Update Project Review, export' (#102) from that-fe into master
Reviewed-on: #102
|
2025-02-07 18:59:52 +11:00 |
|
nguentrungthat
|
174c8889ce
|
Update Project Review, export
|
2025-02-07 14:42:31 +07:00 |
|
nguentrungthat
|
4fd18b988e
|
Update
|
2025-02-06 13:16:07 +07:00 |
|
Joseph
|
9532845bc3
|
update
|
2025-02-03 16:20:00 +07:00 |