Commit Graph
542 Commits
Author SHA1 Message Date
孙广明 260c4c0528 Merge branch 'zenops_62' into 'master'
Zenops 62

See merge request easycorp/zentaopms!7087
2023-02-28 05:22:00 +00:00
zhaoke 0e5b0bedfa * Format code. 2023-02-28 13:19:36 +08:00
zhaoke a4ef56b5f0 * Fix php error when vm not exist. 2023-02-22 14:13:30 +08:00
zhaoke 87e9402d35 * Remove snapshot row when create snap fail. 2023-02-22 13:07:33 +08:00
Lufei 63a8a97c59 * Compatible PHP5.3. 2023-02-21 09:15:53 +08:00
Yagami b2955aa657 * Code for task #85045. 2023-02-20 15:11:00 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
zhaoke 3d3157075c * Finish task #84712. 2023-02-14 10:35:01 +00:00
zhaoke ffcc487808 * Finish task #83362. 2023-02-02 09:16:09 +00:00
zhaoke 04769027c5 * Finish task #83368. 2023-01-31 09:20:14 +00:00
tanghucheng 62c1ed7f9c Merge branch 'master' into zenops_46 2022-12-30 09:40:04 +08:00
孙广明 952b67636f * Fix code style. 2022-12-22 16:33:24 +08:00
孙广明 19d93a07d6 * Add ticket api. 2022-12-22 14:30:12 +08:00
tanghucheng 5b2babca14 Merge branch 'master' into zenops_46 2022-12-20 16:36:44 +08:00
zhaoke b060117c18 * Update log style. 2022-12-20 03:24:37 +00:00
zhaoke 57681a20a1 * Finish task 80387. 2022-12-19 10:57:17 +00:00
zhaoke 121aff11a8 *Fix bug 30983. 2022-12-17 03:44:49 +00:00
宋辰轩 12c0a5ddcc * Support pms effort. 2022-12-15 15:44:59 +08:00
tanghucheng 85ffa23da8 Merge branch 'master' into zenops_46_tanghucheng 2022-12-15 15:27:59 +08:00
Wenrui LI cf3c90d214 * fix unable to get correct execution of task via api, bug #30873. 2022-12-15 14:13:52 +08:00
zhaoke 1cc515b6ac * Fix ztf submit err. 2022-12-15 02:28:36 +00:00
zhaoke 05f427f8aa * Add table css. 2022-12-14 06:24:30 +00:00
zhaoke f8c44733b8 * Add oldTokenSN . 2022-12-14 05:45:09 +00:00
zhaoke a8526afc5d * Add view test result. 2022-12-14 03:51:17 +00:00
tanghucheng ee6a173837 Merge branch 'zenops_46' into zenops_46_tanghucheng 2022-12-14 09:27:49 +08:00
zhaoke 35196893af * Add ztf callback. 2022-12-13 08:04:53 +00:00
zhaoke e20513b242 * Add ztf submit result api. 2022-12-12 08:33:45 +00:00
zhaoke cfcb3be5d1 * Fix issue. 2022-12-09 07:58:14 +00:00
王怡栋 b7b1a6c198 Merge branch 'sprint/220' into 'zenops_46'
Merge branch 'sprint/220' into zenops_46

See merge request easycorp/zentaopms!6518
2022-12-09 06:04:58 +00:00
tanghucheng e11ec7993c Merge branch 'zenops_46' into sprint/220 2022-12-09 13:49:30 +08:00
zhaoke 490d8c11db * Add node extranet. 2022-12-08 03:15:51 +00:00
tanghucheng e7a96aa7d2 * Finish task #78645. 2022-12-07 14:24:05 +08:00
zhaoke 78a934a835 * Add heartbeat 2022-12-07 03:51:25 +00:00
Wenrui LI a6258b2d78 * add todo for tasks search api. 2022-12-07 10:40:01 +08:00
Wenrui LI 8aa30bd281 * use tasks api in zentao bot. 2022-12-07 10:36:49 +08:00
Wenrui LI 6491d70c06 * move task get list by search into task model, and add to api. 2022-12-07 09:43:50 +08:00
zhaoke 65cad942f6 * Add zagent port to database. 2022-12-06 07:25:03 +00:00
zhaoke c3e6000b4e * Fix heatbeat fail. 2022-12-02 09:19:21 +00:00
zhaoke 9d79f78dcb * Add submit task status. 2022-12-02 08:58:57 +00:00
zhaoke 9b18d2e750 * Add submit task 2022-12-02 07:56:40 +00:00
zhaoke a201d42fa5 Merge branch 'zenops_46' into zenops_46_zhaoke_77683 2022-12-01 07:38:58 +00:00
zhaoke 12721262a6 * Add auth 2022-12-01 07:32:59 +00:00
zhaoke 47c52757ca * Add cancel download. 2022-12-01 05:10:43 +00:00
孙广明 d4f5170391 Merge branch 'zenops_46_zhaoke_74993' into 'zenops_46'
Zenops 46 zhaoke 74993

See merge request easycorp/zentaopms!6395
2022-11-28 06:58:42 +00:00
caoyanyi 7272593f0b Merge branch 'master' into sprint/220 2022-11-25 13:52:26 +08:00
zhaoke 0eb5f89999 * Add edit node. 2022-11-24 08:13:33 +00:00
zhaoke c2b0f0a656 * Update zanode name 2022-11-23 02:44:27 +00:00
zhaoke 65adccbff9 * Update for sql change. 2022-11-21 00:56:54 +00:00
caoyanyi b40d86d219 Merge branch 'master' into zenops_46 2022-11-17 14:42:05 +08:00
宋辰轩 4692b3e26e * Don not check password strength. 2022-11-16 16:31:03 +08:00