Commit Graph
28 Commits
Author SHA1 Message Date
zhaoke 05905e5386 Merge branch 'zenops_46_tanghucheng' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46_tanghucheng 2022-12-08 03:16:22 +00:00
zhaoke d60190291c * Fix hostName error. 2022-12-08 02:37:03 +00:00
tanghucheng 3a0dcf7f14 * Fix bug for successModal. 2022-12-08 08:54:14 +08:00
zhaoke e9a9f823d6 * Fix image status error. 2022-12-08 00:35:05 +00:00
zhaoke 7393304ef5 Merge branch 'zenops_46_zhaoke_77683' into zenops_46_tanghucheng 2022-12-07 06:54:21 +00:00
zhaoke cb79c47710 * Add init node. 2022-12-07 06:53:52 +00:00
tanghucheng e7a96aa7d2 * Finish task #78645. 2022-12-07 14:24:05 +08:00
tanghucheng 8a43a646ff * Merge branch 'zenops_46_zhaoke_77683' into zenops_46_tanghucheng. 2022-12-07 14:10:33 +08:00
zhaoke 30d183fab5 Merge branch 'zenops_46_zhaoke_77683' into zenops_46_tanghucheng 2022-12-07 03:53:08 +00:00
zhaoke 78a934a835 * Add heartbeat 2022-12-07 03:51:25 +00:00
zhaoke 56b95ea028 Merge branch 'zenops_46_zhaoke_77683' into zenops_46_tanghucheng 2022-12-06 07:39:00 +00:00
zhaoke 65cad942f6 * Add zagent port to database. 2022-12-06 07:25:03 +00:00
tanghucheng b135baf56c * Fix bug for yask #77683. 2022-12-05 17:17:52 +08:00
tanghucheng 97746df372 * Fix bug for createimage. 2022-12-05 14:16:34 +08:00
tanghucheng 928048133f * Add token for za api. 2022-12-05 13:07:16 +08:00
tanghucheng b4bde0acf7 * Code for task #77685. 2022-12-05 08:35:45 +08:00
tanghucheng 8d0cad5108 Merge branch 'zenops_46_zhaoke_77683' into zenops_46_tanghucheng 2022-12-05 08:34:53 +08:00
tanghucheng 319f587f77 * Finish task #77679. 2022-12-02 08:33:22 +08: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
tanghucheng ab9f2812e0 Merge branch 'zenops_46' into zenops_46_tanghucheng 2022-11-29 14:20:45 +08:00
唐胡成 90155c3eea Merge branch 'zenops_46' into 'zenops_46_tanghucheng'
# Conflicts:
#   module/zanode/view/view.html.php
2022-11-29 01:38:30 +00:00
tanghucheng b2ae4e15a1 * Code for task #76213. 2022-11-29 09:13:53 +08:00
zhaoke fcf2169b20 Fix indent 2022-11-28 06:43:28 +00:00
zhaoke 0eb5f89999 * Add edit node. 2022-11-24 08:13:33 +00:00
zhaoke b48be4763b * Add view host. 2022-11-23 08:21:19 +00:00
zhaoke c2b0f0a656 * Update zanode name 2022-11-23 02:44:27 +00:00