Commit Graph

Select branches

Hide Pull Requests

Sprint-3/MS-23

Sprint-3/MS-24

Sprint-3/MS-26

Sprint-3/MS-28

Sprint-4/MS-35-BE-Technical

Sprint-4/MS-36-FE-Technical

Sprint-4/MS-37-FE-Evaluation

Sprint-4/MS-38-BE-Evaluation

Truong-CreateAutoTicketKPhep

dev

joseph.Update_personnel_allocation

joseph.update_navbar_permissions

master

that-bill

that-fe

truong-fix-create-ticket

truong-frame-drawio

truong-leave-day

truong-report-excel

truong-sprint-1

vi

vi.document

vi.ticket-email

zelda.checkin-for-au

zelda.create-tracking-tool-web

zelda.fix-ui-responsive-client

zelda.push-tracking-tool-web

zelda.refactor-tracking-tool-web

zelda.update-checkin-api

zelda.update-static-file-tracking-tool-web

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

Mono Color

• f0bed712e6 update vite build master Admin 2026-05-21 09:54:39 +0700
• f1de8cb627 update build UI AU Admin 2026-05-21 09:15:09 +0700
• b50dc96ce2 update build UI AU Admin 2026-05-20 16:49:59 +0700
• 744c206743 update build UI Admin 2026-05-20 15:30:39 +0700
• a23f2155dc update auto detect face Joseph 2026-05-20 15:22:24 +0700
• 25918fcb62 Merge pull request 'update UI tablet and mobile' (#167) from zelda.fix-ui-responsive-client into master zelda 2026-05-20 17:13:36 +1000
• 607882343a update UI tablet and mobile zelda.fix-ui-responsive-client Admin 2026-05-20 14:11:05 +0700
• 8cd93c578e update(ui) add responsive for tracking Admin 2026-05-18 10:10:58 +0700
• 755297e5b0 update(ui) add responsive for tracking zelda.checkin-for-au Admin 2026-05-18 10:06:59 +0700
• a3ec46db0a Merge pull request 'update(ui) add responsive for tracking' (#165) from zelda.checkin-for-au into master zelda 2026-05-18 12:51:15 +1000
• ab7ccbe194 update(ui) add responsive for tracking Admin 2026-05-18 09:49:56 +0700
• 4eb3dda0e1 update readme for trackin AU Joseph Le 2026-05-15 16:15:56 +0700
• 1cd6b3a108 clear venv folder Joseph Le 2026-05-15 16:14:20 +0700
• 935e88bb72 Merge pull request 'update(server): connect api to erp and add func remove user' (#164) from zelda.checkin-for-au into master zelda 2026-05-15 19:06:48 +1000
• 2675a60ffc update(server): connect api to erp and add func remove user Admin 2026-05-15 16:06:33 +0700
• 95e4e833b5 Merge pull request 'update(server): connect api to erp and add func remove user' (#163) from zelda.checkin-for-au into master zelda 2026-05-15 18:45:34 +1000
• 8ad0ba9c25 update(server): connect api to erp and add func remove user Admin 2026-05-15 15:43:54 +0700
• 574e92bd23 Merge pull request 'zelda.checkin-for-au' (#162) from zelda.checkin-for-au into master zelda 2026-05-15 18:04:49 +1000
• 925823c525 update(server): connect api to erp and add func remove user Admin 2026-05-15 15:03:50 +0700
• a594ba5ba2 update(server): connect api to erp and add func remove user Admin 2026-05-15 15:00:50 +0700
• 683f85efd4 Merge pull request 'feat(au-checkin): upload checkin version for au' (#161) from zelda.checkin-for-au into master zelda 2026-05-15 14:07:10 +1000
• 6a1e19ec7f feat(au-checkin): upload checkin version for au Admin 2026-05-15 11:06:36 +0700
• 8e54ca0ceb edit Joseph Le 2026-05-14 14:51:34 +0700
• 0f2d5db8a3 feature(office-support): add equipment management and electricity bill attachment Your Name 2026-05-14 14:36:42 +0700
• 980676fe16 update leave day root 2026-01-06 16:24:57 +0700
• 9d536955e4 Merge pull request 'update(checkin tool web): update status when status from server and tool are wrong' (#160) from zelda.refactor-tracking-tool-web into master zelda 2026-05-13 13:26:41 +1000
• a5fa0cbcda update(checkin tool web): update status when status from server and tool are wrong zelda.refactor-tracking-tool-web Admin 2026-05-13 10:24:34 +0700
• 0a4332729d Merge pull request 'update(tracking-tool-web): refactor to speed checkin' (#159) from zelda.refactor-tracking-tool-web into master zelda 2026-05-12 11:46:05 +1000
• 2f1e26d3f6 update(tracking-tool-web): refactor to speed checkin Admin 2026-05-12 08:43:12 +0700
• 3d1b43e200 Merge pull request 'that-bill' (#158) from that-bill into master that-bill andrew.ng 2026-04-29 17:29:11 +1000
• 8d86fc2182 Update OfficeSupport.tsx nguyentrungthat 2026-04-29 14:28:56 +0700
• 54b8b9737b Merge branch 'master' into that-bill nguyentrungthat 2026-04-29 14:13:55 +0700
• 42c5791da8 Merge pull request 'Update' (#157) from that-bill into master andrew.ng 2026-04-29 17:13:48 +1000
• 8d5199342d Update nguyentrungthat 2026-04-29 14:13:19 +0700
• beccf5796c Merge pull request 'Add electricity bills module (API, model, PDF)' (#156) from that-bill into master andrew.ng 2026-04-29 16:49:41 +1000
• baa3216c69 Add electricity bills module (API, model, PDF) nguyentrungthat 2026-04-29 13:44:34 +0700
• de351f0877 Merge pull request 'fix(setting): update hr permission' (#155) from vi into master joseph 2026-04-18 11:20:57 +1000
• 2c94e91668 fix(setting): update hr permission vi Hoang Vi 2026-04-18 07:52:39 +0700
• b22c9b9cc5 Merge pull request 'feat(setting): add setting saturday work' (#154) from vi into master joseph 2026-04-09 19:24:31 +1000
• f494367683 feat(setting): add setting saturday work Hoang Vi 2026-04-09 16:11:18 +0700
• 61124cd9bb Merge pull request 'fix run cron job initialize leaveDays' (#153) from vi into master joseph 2026-01-06 20:16:40 +1100
• 78066f624e fix run cron job initialize leaveDays Nguyễn Hoàng Vĩ 2026-01-06 16:02:24 +0700
• d7b7a61511 Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into vi Nguyễn Hoàng Vĩ 2026-01-06 15:59:54 +0700
• 8f30081e55 fix ngày phép Truong Vo 2026-01-05 08:20:01 +0700
• a0bfb19a34 Bổ sung + thêm phép đặc biệt khi chuyển phép từ năm cũ Truong Vo 2026-01-02 08:18:29 +0700
• 7e369785d5 fix truong-fix-create-ticket Truong Vo 2025-12-30 10:08:18 +0700
• 54046ac676 Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into vi Nguyễn Hoàng Vĩ 2025-12-23 14:58:56 +0700
• 9f921750fc Merge pull request 'fix(noti): Fix notification' (#152) from zelda.update-checkin-api into master zelda 2025-12-23 11:43:55 +1100
• bd0d4fa13b fix(noti): Fix notification zelda.update-checkin-api Admin 2025-12-23 07:43:27 +0700
• f5362e54ef Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into vi Nguyễn Hoàng Vĩ 2025-12-22 08:20:52 +0700
• 17dc0c3374 Merge pull request 'update(fe): remove speak check in and check out' (#151) from zelda.update-checkin-api into master zelda 2025-12-19 11:39:13 +1100
• 29dc787c65 update(fe): remove speak check in and check out Admin 2025-12-19 07:37:59 +0700
• 6ccf5e9e8a Merge pull request 'update(fe): speak name' (#150) from zelda.update-checkin-api into master zelda 2025-12-15 17:41:55 +1100
• 5736166da3 update(fe): speak name Admin 2025-12-15 13:41:19 +0700
• 7be6a12edc Merge pull request 'update(fe): Move quantity variable to env' (#149) from zelda.update-checkin-api into master zelda 2025-12-12 14:39:41 +1100
• 70436f737f update(fe): Move quantity variable to env Admin 2025-12-12 10:38:39 +0700
• 25162be83d Merge pull request 'update(ttw): update auto sync user' (#148) from zelda.update-checkin-api into master zelda 2025-12-12 14:17:33 +1100
• 06027e8f23 update(ttw): update auto sync user Admin 2025-12-12 10:16:23 +0700
• 8c7a24d31c Merge pull request 'update(ttw): run send image in backgound' (#147) from zelda.update-checkin-api into master zelda 2025-12-11 18:56:14 +1100
• 1f08e2b503 update(ttw): run send image in backgound Admin 2025-12-11 14:55:09 +0700
• 5154464646 update(ttw): run send image in backgound zelda.update-static-file-tracking-tool-web Admin 2025-12-11 14:47:34 +0700
• 9d77dfc5d6 Merge pull request 'feat(tkw): update ui' (#146) from zelda.update-static-file-tracking-tool-web into master zelda 2025-12-11 14:34:48 +1100
• e7aa80f14b feat(tkw): update ui Admin 2025-12-11 10:34:26 +0700
• 24bd605b7c Merge pull request 'feat(tkw): update file main models' (#145) from zelda.update-static-file-tracking-tool-web into master zelda 2025-12-11 14:04:53 +1100
• 2a5f7b0b25 feat(tkw): update file main models Admin 2025-12-11 10:04:29 +0700
• 9183540976 Merge pull request 'feat(tkw): update file main code' (#144) from zelda.update-static-file-tracking-tool-web into master zelda 2025-12-11 13:35:33 +1100
• cdce726ff1 feat(tkw): update file main code Admin 2025-12-11 09:35:01 +0700
• 790cab255d Merge pull request 'feat(tkw): Update static file' (#143) from zelda.update-static-file-tracking-tool-web into master zelda 2025-12-11 13:31:37 +1100
• 647fc455d5 feat(tkw): Update static file Admin 2025-12-11 09:30:39 +0700
• b5f5fa1748 Merge pull request 'update client for server' (#142) from zelda.push-tracking-tool-web into master zelda 2025-12-11 13:11:33 +1100
• 5a564e3703 update client for server zelda.push-tracking-tool-web Admin 2025-12-11 09:10:42 +0700
• 0af2357bc2 Merge pull request 'feat(tkw): Tracking tool web' (#141) from zelda.push-tracking-tool-web into master joseph 2025-12-10 20:29:24 +1100
• a623659b52 feat(tkw): Tracking tool web Admin 2025-12-10 16:23:45 +0700
• 5702cda371 feat(tkw): Tracking tool web zelda.create-tracking-tool-web Admin 2025-12-10 16:06:15 +0700
• b35d4d7ca5 Merge pull request 'dev' (#140) from dev into master joseph 2025-08-05 19:13:38 +1000
• 522034ab76 Merge pull request 'update timekeeping, leave UI' (#139) from vi into dev dev joseph 2025-08-05 19:13:12 +1000
• 487f4227d8 Merge branch 'dev' of https://gitea.nswteam.net/joseph/ManagementSystem into vi dbdbd9 2025-08-05 16:10:32 +0700
• 56d2889297 update timekeeping, leave UI dbdbd9 2025-08-05 16:08:48 +0700
• 7c36add579 Merge pull request 'dev' (#138) from dev into master joseph 2025-08-05 18:27:42 +1000
• 6c61819f2e Merge pull request 'update handle for separated user' (#137) from vi into dev joseph 2025-08-05 18:26:09 +1000
• f649b2a6ac Merge branch 'dev' of https://gitea.nswteam.net/joseph/ManagementSystem into vi dbdbd9 2025-08-05 15:19:15 +0700
• d335803cf8 update handle for separated user dbdbd9 2025-08-05 15:14:50 +0700
• da0bb9ad0d Merge pull request 'dev' (#136) from dev into master joseph 2025-07-31 12:47:25 +1000
• d3d9acb1ce Merge pull request 'fix calculate work time' (#135) from vi.ticket-email into dev joseph 2025-07-31 12:32:10 +1000
• a4751e9d38 Merge branch 'dev' of https://gitea.nswteam.net/joseph/ManagementSystem into vi.ticket-email dbdbd9 2025-07-31 09:15:59 +0700
• b52537cfe4 fix calculate work time vi.ticket-email dbdbd9 2025-07-31 09:14:33 +0700
• efaf906f0a Merge pull request 'dev' (#134) from dev into master that-fe joseph 2025-07-02 12:54:43 +1000
• 3e865e5575 Merge pull request 'update permission display for leave management' (#133) from vi.ticket-email into dev joseph 2025-07-02 11:23:51 +1000
• 4f6f3dd803 Merge branch 'dev' of https://gitea.nswteam.net/joseph/ManagementSystem into vi.ticket-email dbdbd9 2025-07-02 07:46:58 +0700
• ee281986b8 update permission display for leave management dbdbd9 2025-07-01 16:36:21 +0700
• 6e1e452bf1 Merge pull request 'Deploy to prod' (#132) from dev into master joseph 2025-07-01 17:54:53 +1000
• 6528b7bc59 Merge pull request 'add update note status' (#131) from vi.ticket-email into dev joseph 2025-07-01 17:26:34 +1000
• fd1be27414 Merge branch 'dev' of https://gitea.nswteam.net/joseph/ManagementSystem into vi.ticket-email dbdbd9 2025-07-01 13:41:05 +0700
• d064b242e6 add update note status dbdbd9 2025-07-01 13:40:48 +0700
• 8f6977be72 Merge pull request 'dev' (#130) from dev into master joseph 2025-06-30 18:37:38 +1000
• af67644416 Merge pull request 'adjust UI, add send mail when delete note/update refuse ticket' (#129) from vi.ticket-email into dev joseph 2025-06-30 18:14:26 +1000
• 705e8f9216 adjust UI, add send mail when delete note/update refuse ticket dbdbd9 2025-06-30 14:58:06 +0700
• db4feedde3 Merge pull request 'update handle calculate onleave ticket in next months' (#128) from vi.ticket-email into dev joseph 2025-06-30 16:11:00 +1000
• 27b59ae939 update msg dbdbd9 2025-06-30 11:04:44 +0700
• 034b9eee2c update handle calculate onleave ticket in next months dbdbd9 2025-06-30 10:57:02 +0700