 zhaoke
|
c45cc99854
|
Fix issue
|
2022-12-09 05:57:49 +00: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 |
|
|
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 |
|
|
zhaoke
|
d8b33a03b0
|
* Fix css.
|
2022-12-06 07:32:02 +00:00 |
|
|
zhaoke
|
65cad942f6
|
* Add zagent port to database.
|
2022-12-06 07:25:03 +00:00 |
|
|
caoyanyi
|
f0195d10ce
|
* Update sql.
|
2022-12-06 15:09:34 +08:00 |
|
|
tanghucheng
|
ee2fed7a28
|
* Finish task #79050.
|
2022-12-06 13:40:26 +08:00 |
|
|
tanghucheng
|
b135baf56c
|
* Fix bug for yask #77683.
|
2022-12-05 17:17:52 +08:00 |
|
|
tanghucheng
|
74d5326b36
|
* Fix zahost list action.
|
2022-12-05 15:47:10 +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 |
|
|
zhaoke
|
b7959de831
|
Merge branch 'zenops_46_tanghucheng' into zenops_46_zhaoke_77683
|
2022-12-05 03:00:00 +00:00 |
|
|
tanghucheng
|
c397bfb177
|
* Update sql.
|
2022-12-05 10:58:09 +08:00 |
|
|
zhaoke
|
2b0166851c
|
* Update init bash cmd.
|
2022-12-05 02:41:51 +00: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 |
|
|
caoyanyi
|
36fbbfc21b
|
Merge branch 'master' into zenops_46
|
2022-12-05 08:31:12 +08:00 |
|
|
朱金勇
|
5ce6a71fd1
|
Merge branch 'change_reportbug_lang' into 'master'
* Change report bug lang.
See merge request easycorp/zentaopms!6453
|
2022-12-02 10:59:59 +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 |
|
|
Lufei
|
90c061cb40
|
* Change report bug lang.
|
2022-12-02 15:07:22 +08:00 |
|
|
wangyidong
|
15aecd0bf9
|
* fix bug #30506.
|
2022-12-02 14:54:59 +08:00 |
|
|
zhaoke
|
d1e95a46cd
|
* Finish task 77678.
|
2022-12-02 06:51:11 +00:00 |
|
|
zhaoke
|
8955e37d09
|
* Add cancel download confirm.
|
2022-12-02 03:20:26 +00:00 |
|