 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 |
|
|
zhaoke
|
42864821b7
|
* Fix action tr width.
|
2022-12-07 07:18:26 +00:00 |
|
|
zhaoke
|
cff035123c
|
* Add action button.
|
2022-12-07 07:13:00 +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
|
600a628561
|
* Fix create image rate.
|
2022-12-07 14:42:53 +08:00 |
|
|
唐胡成
|
c6aafbd707
|
Merge branch 'zenops_46' into 'zenops_46_tanghucheng'
# Conflicts:
# module/zanode/lang/de.php
# module/zanode/lang/en.php
# module/zanode/lang/fr.php
# module/zanode/lang/zh-cn.php
# module/zanode/model.php
|
2022-12-07 06:27:38 +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 |
|
|
caoyanyi
|
cbc00cef81
|
* Modify window resize style.
|
2022-12-07 09:14:26 +08:00 |
|
|
caoyanyi
|
23300a9f4c
|
Merge branch 'zenops_46' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46
|
2022-12-06 17:37:38 +08:00 |
|
|
caoyanyi
|
ba09f011a0
|
* Modify commit log style.
|
2022-12-06 17:37:09 +08:00 |
|
|
王怡栋
|
4070cc1fb9
|
Merge branch 'zenops_46_tanghucheng' into 'zenops_46'
Merge branch 'zenops 46 tanghucheng' into 'zenops 46'
See merge request easycorp/zentaopms!6473
|
2022-12-06 09:32:36 +00:00 |
|
|
tanghucheng
|
185d280025
|
* Code for task #78645.
|
2022-12-06 17:25:03 +08:00 |
|
|
zhaoke
|
d27ce40eec
|
* Update control function name.
|
2022-12-06 08:43:43 +00:00 |
|
|
zhaoke
|
56b95ea028
|
Merge branch 'zenops_46_zhaoke_77683' into zenops_46_tanghucheng
|
2022-12-06 07:39:00 +00:00 |
|