Commit Graph
48845 Commits
Author SHA1 Message Date
caoyanyi 000824ef95 * Modify chosen error. 2022-12-16 10:38:52 +08:00
曹延义 149096ed6c * Modify diff page style. 2022-12-16 01:07:18 +00:00
唐胡成 7c47e59417 Merge branch 'zenops_46_tanghucheng' into 'zenops_46'
Merge branch 'zenops_46_tanghucheng' into zenops_46

See merge request easycorp/zentaopms!6564
2022-12-15 07:24:08 +00:00
tanghucheng dda942dbba Merge branch 'zenops_46' into zenops_46_tanghucheng 2022-12-15 15:20:52 +08:00
tanghucheng 8162ed067c * Fix issue for run ztf script. 2022-12-15 10:55:41 +08:00
zhaoke cc9773b09d Merge branch 'zenops_46_tanghucheng' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46_tanghucheng 2022-12-15 02:30:23 +00:00
zhaoke 1cc515b6ac * Fix ztf submit err. 2022-12-15 02:28:36 +00:00
tanghucheng ef3f7a32d2 * Finish task #78647. 2022-12-15 10:00:48 +08:00
zhaoke e5ad70caca * Fix bugs. 2022-12-14 08:54:18 +00:00
zhaoke 6d05d76b2c Merge branch 'zenops_46_tanghucheng' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46_tanghucheng 2022-12-14 06:44:32 +00:00
zhaoke 520fcdb38a * Fix bugs. 2022-12-14 06:44:24 +00:00
zhaoke 05f427f8aa * Add table css. 2022-12-14 06:24:30 +00:00
tanghucheng a454682370 * Finish task #78643. 2022-12-14 14:16:49 +08:00
zhaoke f8c44733b8 * Add oldTokenSN . 2022-12-14 05:45:09 +00:00
zhaoke a3e6865363 * Add lang. 2022-12-14 04:01:15 +00:00
zhaoke a8526afc5d * Add view test result. 2022-12-14 03:51:17 +00:00
王怡栋 b690342f0c Merge branch 'zenops_46_tanghucheng' into 'zenops_46'
Zenops 46 tanghucheng

See merge request easycorp/zentaopms!6541
2022-12-14 02:26:45 +00:00
zhaoke c7d2556edd Merge branch 'zenops_46_tanghucheng' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46_tanghucheng 2022-12-14 01:39:11 +00:00
zhaoke fc36debdf9 * Add node column. 2022-12-14 01:38:37 +00:00
tanghucheng ee6a173837 Merge branch 'zenops_46' into zenops_46_tanghucheng 2022-12-14 09:27:49 +08:00
tanghucheng a0e324bbd5 * Fix issue. 2022-12-14 09:12:45 +08:00
zhaoke d2175b728e * Fix issue 2022-12-13 09:49:25 +00:00
zhaoke ab25208e76 *Add install service 2022-12-13 09:22:31 +00:00
zhaoke 35196893af * Add ztf callback. 2022-12-13 08:04:53 +00:00
孙广明 664d508e2f Merge branch 'zenops_46_wangjianhua_79797' into 'zenops_46'
* Modify lang items about devops.

See merge request easycorp/zentaopms!6528
2022-12-13 02:54:50 +00:00
wangjianhua 300c9335f6 * Update fr lang items of Job module. 2022-12-13 10:40:25 +08:00
wangjianhua e78a85b523 * Update tw lang items. 2022-12-13 10:22:12 +08:00
wangjianhua 429a1d37fa * Modify lang items about devops. 2022-12-12 18:39:23 +08:00
zhaoke 4c6bf2e789 * Remove test code. 2022-12-12 08:47:37 +00:00
zhaoke e20513b242 * Add ztf submit result api. 2022-12-12 08:33:45 +00:00
caoyanyi bbba47ecfb Merge branch 'zenops_46' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46 2022-12-12 08:29:34 +08:00
caoyanyi 8b3e09b0e4 * Modify data empty error. 2022-12-12 08:29:07 +08: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
zhaoke c45cc99854 Fix issue 2022-12-09 05:57:49 +00:00
唐胡成 57b6b554e7 Merge branch 'zenops_46_tanghucheng' into 'zenops_46'
* Fix node status error.

See merge request easycorp/zentaopms!6514
2022-12-09 05:52:48 +00:00
tanghucheng e11ec7993c Merge branch 'zenops_46' into sprint/220 2022-12-09 13:49:30 +08:00
tanghucheng 906b8a81c5 Merge branch 'zenops_46' into zenops_46_tanghucheng 2022-12-09 13:44:59 +08:00
zhaoke 6a65a41eef Merge branch 'zenops_46_tanghucheng' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46_tanghucheng 2022-12-09 02:18:35 +00:00
zhaoke 4511932689 * Fix issue. 2022-12-09 02:18:28 +00:00
tanghucheng ba12988150 * Add sql for zanode. 2022-12-09 09:59:23 +08:00
zhaoke 30bcd588b7 * Fix node status error. 2022-12-08 03:43:38 +00:00
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 490d8c11db * Add node extranet. 2022-12-08 03:15:51 +00:00
zhaoke d60190291c * Fix hostName error. 2022-12-08 02:37:03 +00:00
tanghucheng c9fd5def51 * Update sql for 18.0 devops. 2022-12-08 10:15:04 +08: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
王怡栋 a03a760af6 Merge branch 'zenops_46_tanghucheng' into 'zenops_46'
* Merge branch 'zenops_46_tanghucheng' into zenops_46.

See merge request easycorp/zentaopms!6490
2022-12-08 00:32:39 +00:00
tanghucheng 3d5ff064db * Move successModal to common. 2022-12-07 16:18:57 +08:00