Commit Graph
47623 Commits
Author SHA1 Message Date
zhaoke 45e1c4dc20 * Add view zahost. 2022-11-18 01:43:33 +00:00
wangjianhua fdf3e3cb16 + Add os info for VM image. 2022-11-15 13:07:57 +08:00
zhaoke 78e89ded46 * Add desc lang 2022-11-15 03:32:20 +00:00
zhaoke ce94e24fdb Merge branch 'zenops_46_wangjianhua_74990' into zenops_46_zhaoke_74993 2022-11-15 03:20:42 +00:00
zhaoke a154be14e9 * Update lang 2022-11-15 03:19:42 +00:00
wangjianhua bbaa550c05 + Add language items for VM Image. 2022-11-15 11:03:21 +08:00
wangjianhua 4141110e74 * Modify function name. 2022-11-15 10:50:12 +08:00
wangjianhua 032641a085 * Add progress of downloading image. 2022-11-15 10:23:56 +08:00
zhaoke 0630753029 * Add default port 2022-11-15 01:39:44 +00:00
zhaoke 7da63113a5 Merge branch 'zenops_46_wangjianhua_74990' into zenops_46_zhaoke_74993 2022-11-15 00:41:37 +00:00
zhaoke 5f575c16f5 * Add real url 2022-11-15 00:39:23 +00:00
wangjianhua 737d2a3d20 - Remove create image button. 2022-11-14 17:45:29 +08:00
wangjianhua d4e8c3cfd3 * Modify image list page. 2022-11-14 17:42:42 +08:00
zhaoke bc1421d7b5 * Fix bug 2022-11-14 08:55:33 +00:00
zhaoke 223c86c6fd * Finish task 74993. 2022-11-14 03:27:17 +00:00
wangjianhua 42fb46ed51 * Modify api of downloading image status. 2022-11-11 17:52:32 +08:00
wangjianhua 74beb1f75a * Finish download image. 2022-11-11 17:09:24 +08:00
wangjianhua 2a361532b4 * Modify zt_image table. 2022-11-11 13:19:06 +08:00
wangjianhua b1545ae325 * Hide some buttons in image list page. 2022-11-11 10:29:03 +08:00
wangjianhua 0e2c874fed * Add hostID to image table. 2022-11-11 09:56:31 +08:00
wangjianhua fc921fa980 * Add hostID to image table. 2022-11-11 09:53:41 +08:00
zhaoke 0f6ba1160f Merge branch 'zenops_46_wangjianhua_74990' into zenops_46_zhaoke_74993 2022-11-11 01:04:34 +00:00
wangjianhua 38b5b41a64 * Add image list page of zahost module. 2022-11-11 08:58:23 +08:00
zhaoke dfa13273c0 * Add execnode table. 2022-11-10 08:24:13 +00:00
zhaoke 7550e05863 * Add init host page. 2022-11-10 08:02:07 +00:00
zhaoke 72f4ecbb2b * Add sql. 2022-11-09 00:52:08 +00:00
caoyanyi 1630ab8885 Merge branch 'master' into zenops_46 2022-11-08 09:24:42 +08:00
wangyidong bd18396178 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-08 08:41:50 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
李玉春 2de5c636ed Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!6071
2022-11-08 00:33:03 +00:00
王怡栋 1ef9917477 Merge branch 'zentaopms_239_task_#74859' into 'zentaopms_239'
* Fix bug for task #74859.

See merge request easycorp/zentaopms!6070
2022-11-08 00:30:14 +00:00
tianshujie e1ca6e57aa * Fix bug #29361. 2022-11-07 17:21:08 +08:00
朱金勇 39bee976e5 Merge branch 'sprint/fix-api' into 'master'
* Fix missing requireFields error.

See merge request easycorp/zentaopms!6066
2022-11-07 09:14:13 +00:00
鲁飞 b8619da3a6 * Fix missing requireFields error. 2022-11-07 09:14:12 +00:00
朱金勇 b3917c280d Merge branch 'sprint/add-taskrestart' into 'master'
* Support task restart api.

See merge request easycorp/zentaopms!6067
zentaopms_17.8
2022-11-07 08:59:03 +00:00
daitingting 03ff1ab5b0 * Fix bug for task #74859. 2022-11-07 08:54:16 +00:00
孙广明 3dc995919d Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #29363

See merge request easycorp/zentaopms!6069
2022-11-07 08:52:12 +00:00
lanzongjun 1e16357fe3 * fix bug #29363 2022-11-07 16:50:51 +08:00
Yagami 6413f85918 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-07 16:37:35 +08:00
Yagami 7f1ac56f29 * Fix bug #29369. 2022-11-07 16:36:58 +08:00
tianshujie c05b94e3b0 * Fix bug #29377. 2022-11-07 16:00:47 +08:00
Lufei 3e69145e58 * Support task restart api. 2022-11-07 15:31:18 +08:00
孙广明 0d9ca308b0 Merge branch 'lyk_feedback_1380' into 'master'
* Resolve feedback #1380.

See merge request easycorp/zentaopms!6065
2022-11-07 07:21:41 +00:00
wangyidong d354c68adf * adjust for task #74928. 2022-11-07 15:19:58 +08:00
李玉春 62349c46b3 Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #29376.

See merge request easycorp/zentaopms!6064
2022-11-07 07:18:18 +00:00
李玉春 624bfcbeed Merge branch 'sprint/tianshujie_css' into 'master'
Sprint/tianshujie css

See merge request easycorp/zentaopms!6061
2022-11-07 07:17:15 +00:00
liuyongkai 50e118bea4 * Resolve feedback #1380. 2022-11-07 07:16:14 +00:00
tianshujie f6d526d916 * Fix bug #29376. 2022-11-07 15:12:30 +08:00
孙广明 15f7a8c486 Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug#29356.

See merge request easycorp/zentaopms!6063
2022-11-07 06:57:52 +00:00
xieqiyu e5accc3154 * Fix bug#29356. 2022-11-07 06:54:28 +00:00