Commit Graph

165 Commits

Author SHA1 Message Date
9225a489e5 Resolved merge conflict in MarineController.cs 2025-04-09 16:49:18 +08:00
5b0553527b test mock data 2025-04-09 16:36:48 +08:00
76cbe99b98 test 2025-04-08 15:59:14 +08:00
e8a290c4e4 Merge remote-tracking branch 'origin/misya' into misya
merged changes from origin/misya into misya
2025-04-08 15:52:33 +08:00
7a8be354ed test comment 2025-04-08 15:19:09 +08:00
2887cd3f4e test 2025-04-08 11:15:22 +08:00
526acc406b improvised tarball report, and tarball pdf 2025-04-08 11:15:22 +08:00
00b0e6eb0c comment 2025-03-28 10:31:41 +08:00
2c7ee5aca9 tarballform 2025-03-28 10:29:59 +08:00
3d6647b87d test 2025-03-24 16:42:22 +08:00
824b6ea2ff test 2025-03-19 09:26:29 +08:00
5e73be28c3 testt 2025-03-17 10:41:50 +08:00
530f132256 teat 2025-03-17 10:36:04 +08:00
f05c23f259 test 2025-03-17 10:35:00 +08:00
11710f440d test 2025-03-17 10:33:51 +08:00
1f813b88bb comment 2025-03-17 10:32:51 +08:00
0a3b0fb214 comment 2025-03-17 10:31:57 +08:00
59f45bb4bd first update 2025-03-17 10:21:50 +08:00
7c66571264 Update appsettings.json 2025-03-17 09:56:25 +08:00
61f053175f Update RBAC 2025-03-14 11:02:45 +08:00
e5e1414826 Merge branch 'Dev2' of https://git.pstw.com.my/catalyx/PSTW_CentralizeSystem into Dev2 2025-03-14 07:44:33 +08:00
c45251e08f Update Item & Product 2025-03-14 07:44:19 +08:00
2c10b89147 small fix 2025-03-14 07:29:25 +08:00
58f3fc4c48 Update Item & Product 2025-03-12 07:42:57 +08:00
9f1283f7c9 Update Request & Fix Item Qr Code 2025-03-11 09:54:45 +08:00
bf6e53b56e Merge branch 'Dev2' of https://git.pstw.com.my/catalyx/PSTW_CentralizeSystem into Dev2 2025-03-10 22:28:56 +08:00
ce2a741450 Update Qr 2025-03-10 22:28:46 +08:00
291d4dabdb Merge branch 'Dev2' of https://git.pstw.com.my/catalyx/PSTW_CentralizeSystem into Dev2 2025-03-10 15:59:45 +08:00
a1db9175a3 fix item movement qr master 2025-03-10 15:59:40 +08:00
ed04371e3c Merge branch 'Dev2' of https://git.pstw.com.my/catalyx/PSTW_CentralizeSystem into Dev2 2025-03-10 09:40:42 +08:00
21a950f519 Update Qr 2025-03-10 09:40:33 +08:00
cc99419e49 maintain code readability 2025-03-10 09:31:48 +08:00
6c2923ca1a maintain code readability 2025-03-10 09:30:17 +08:00
53bbde0f0b Update 2025-03-10 08:57:27 +08:00
2d474477fa Merge branch 'Dev2' of https://git.pstw.com.my/catalyx/PSTW_CentralizeSystem into Dev2 2025-03-08 02:24:29 +08:00
1e49f979aa Item Movement User 2025-03-08 02:24:14 +08:00
02197f4c1f fix ui admin item movement 2025-03-07 23:31:07 +08:00
9ed5e6b6a5 Merge branch 'Dev2' of https://git.pstw.com.my/catalyx/PSTW_CentralizeSystem into Dev2 2025-03-07 14:31:25 +08:00
d316a42a5e update ui 2025-03-07 14:31:19 +08:00
9857983174 Item Movement User 2025-03-07 14:29:48 +08:00
0225c22696 Merge branch 'Dev2' of https://git.pstw.com.my/catalyx/PSTW_CentralizeSystem into Dev2 2025-03-07 09:08:58 +08:00
e43205c08e update 2025-03-07 09:08:48 +08:00
a3dc02fb80 Item Movement User 2025-03-07 09:07:47 +08:00
e78e1c979e Merge branch 'Dev2' of https://git.pstw.com.my/catalyx/PSTW_CentralizeSystem into Dev2 2025-03-06 15:53:28 +08:00
ea9038d6b8 fix ui itemmovement admin
update product image
2025-03-06 15:53:22 +08:00
1542750302 Item Movement & request 2025-03-06 15:52:41 +08:00
37ea90be65 Merge branch 'Dev2' of https://git.pstw.com.my/catalyx/PSTW_CentralizeSystem into Dev2 2025-03-06 12:19:49 +08:00
ea54070d54 fix table itemmovement master 2025-03-06 12:19:42 +08:00
ce941d5d53 Item Movement User 2025-03-06 12:18:18 +08:00
48636528b1 Merge branch 'Dev2' of https://git.pstw.com.my/catalyx/PSTW_CentralizeSystem into Dev2 2025-03-06 09:11:43 +08:00