 tanghucheng
|
fe30731334
|
* Add loading style for ajaxGetServiceStatus.
|
2023-01-03 09:44:18 +08:00 |
|
|
tanghucheng
|
3239f63739
|
* Fix bug #31351.
|
2023-01-03 08:49:28 +08:00 |
|
|
tanghucheng
|
d837ce9ac4
|
* Fix code style.
|
2022-12-30 14:09:00 +08:00 |
|
|
tanghucheng
|
e6a17511b9
|
* Update button name.
|
2022-12-30 14:03:42 +08:00 |
|
|
tanghucheng
|
720365e1e2
|
Merge branch 'zenops_46' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46
|
2022-12-30 14:03:21 +08:00 |
|
|
tanghucheng
|
511d82eb97
|
Merge branch 'zenops_46' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46
|
2022-12-30 13:50:44 +08:00 |
|
|
tanghucheng
|
c04a1207d0
|
* Fix bug.
|
2022-12-30 10:40:41 +08:00 |
|
|
tanghucheng
|
58c87b20ed
|
* Add help button for zahost.
|
2022-12-30 10:37:34 +08:00 |
|
|
tanghucheng
|
7ca5883d60
|
* Fix merge issue.
|
2022-12-30 10:18:13 +08:00 |
|
|
tanghucheng
|
1e6e94753b
|
* Fix bug.
|
2022-12-30 09:57:03 +08:00 |
|
|
tanghucheng
|
4ce729067c
|
Merge branch 'master' into zenops_46
|
2022-12-30 09:49:34 +08:00 |
|
|
tanghucheng
|
62c1ed7f9c
|
Merge branch 'master' into zenops_46
|
2022-12-30 09:40:04 +08:00 |
|
|
tanghucheng
|
b8331ea6f1
|
* Fix issue.
|
2022-12-30 09:01:55 +08:00 |
|
|
tanghucheng
|
49cb8a7bcb
|
* Fix bug #31328.
|
2022-12-29 19:28:02 +08:00 |
|
|
tanghucheng
|
63779ca808
|
* Finish story #41213.
|
2022-12-29 19:21:40 +08:00 |
|
|
tanghucheng
|
ebf7f1edb8
|
* Fix bug.
|
2022-12-29 16:25:34 +08:00 |
|
|
tanghucheng
|
8f96b6da84
|
* Fix bug #31323.
|
2022-12-29 15:47:34 +08:00 |
|
|
tanghucheng
|
4d6e127f4e
|
* Fix bug.
|
2022-12-29 15:42:07 +08:00 |
|
|
tanghucheng
|
ce733f18f7
|
Merge branch 'zenops_46_tanghucheng' into zenops_46
|
2022-12-29 15:38:13 +08:00 |
|
|
tanghucheng
|
e1162e3582
|
* Fix bug .
|
2022-12-29 15:37:36 +08:00 |
|
|
tanghucheng
|
ad83873794
|
* Fix issue for gantt icon.
|
2022-12-29 14:22:59 +08:00 |
|
|
tanghucheng
|
fa37b1a503
|
* Add start and close pri.
|
2022-12-29 13:59:02 +08:00 |
|
|
tanghucheng
|
c55e8aea86
|
* Fix issue.
|
2022-12-29 13:08:00 +08:00 |
|
|
tanghucheng
|
45797b3703
|
* Fix issue for zahost view.
|
2022-12-29 10:37:25 +08:00 |
|
|
tanghucheng
|
8fae3fc5e2
|
Merge branch 'zenops_46_tanghucheng' into zenops_46
|
2022-12-29 10:28:59 +08:00 |
|
|
tanghucheng
|
237da33c90
|
* Finish task #81388.
|
2022-12-29 10:27:44 +08:00 |
|
|
tanghucheng
|
3a4d0a6aec
|
* Finish task #81388.
|
2022-12-28 20:04:54 +08:00 |
|
|
tanghucheng
|
6582359c3f
|
* Code for task #81383.
|
2022-12-27 16:51:55 +08:00 |
|
|
tanghucheng
|
00479a5ad9
|
Merge branch 'zenops_46_tanghucheng' into zenops_46
|
2022-12-27 13:38:42 +08:00 |
|
|
tanghucheng
|
c27f758bf8
|
* Finish task #81387.
|
2022-12-27 13:36:30 +08:00 |
|
|
tanghucheng
|
37237950ce
|
* Finish task #81386,81385,81384.
|
2022-12-27 13:14:59 +08:00 |
|
|
tanghucheng
|
b291f3cc95
|
* Fix issue.
|
2022-12-26 10:42:44 +08:00 |
|
|
tanghucheng
|
ba606b1dab
|
Merge branch 'zenops_46_tanghucheng' into zenops_46
|
2022-12-23 11:11:47 +08:00 |
|
|
tanghucheng
|
fde26c3abf
|
* Fix bug #31115.
|
2022-12-23 11:10:31 +08:00 |
|
|
tanghucheng
|
49f8a2b2e9
|
* Fix issue .
|
2022-12-23 10:47:28 +08:00 |
|
|
tanghucheng
|
df93462804
|
Merge branch 'zenops_46_tanghucheng' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46_tanghucheng
|
2022-12-23 09:57:15 +08:00 |
|
|
tanghucheng
|
a25e76b320
|
Merge branch 'zenops_46' into zenops_46_tanghucheng
|
2022-12-20 16:45:04 +08:00 |
|
|
tanghucheng
|
5975278edc
|
* Merge master into zenops_46.
|
2022-12-20 16:44:27 +08:00 |
|
|
tanghucheng
|
5b2babca14
|
Merge branch 'master' into zenops_46
|
2022-12-20 16:36:44 +08:00 |
|
|
tanghucheng
|
ea6e03772c
|
* Fix bug #31065.
|
2022-12-20 15:56:19 +08:00 |
|
|
tanghucheng
|
38a7cfe4df
|
* Fix bug #31051.
|
2022-12-20 11:18:42 +08:00 |
|
|
tanghucheng
|
d789075902
|
* Finish task #80388.
|
2022-12-20 10:36:19 +08:00 |
|
|
tanghucheng
|
f754f0b0e0
|
* Fix lang file for zahost.
|
2022-12-20 08:42:48 +08:00 |
|
|
tanghucheng
|
ca4666f7a0
|
* Fix merge clash.
|
2022-12-20 08:36:33 +08:00 |
|
|
tanghucheng
|
6d20a68043
|
* Finish task #80389.
|
2022-12-19 16:23:24 +08:00 |
|
|
tanghucheng
|
b77a939f38
|
* Finish task #80728,80727.
|
2022-12-19 16:19:26 +08:00 |
|
|
tanghucheng
|
36a59c5285
|
Merge branch 'zenops_46_tanghucheng' into zenops_46
|
2022-12-16 20:21:01 +08:00 |
|
|
tanghucheng
|
26d746598e
|
* Fix bug for zanode.
|
2022-12-16 20:20:06 +08:00 |
|
|
tanghucheng
|
769c65781b
|
* Fix bug #30971.
|
2022-12-16 19:16:56 +08:00 |
|
|
tanghucheng
|
0d454a3649
|
* Fix bug #30979.
|
2022-12-16 17:46:22 +08:00 |
|
|
tanghucheng
|
227e675339
|
* Fix bug #30989.
|
2022-12-16 17:32:49 +08:00 |
|
|
tanghucheng
|
678f8c813a
|
Merge branch 'zenops_46_tanghucheng' into zenops_46
|
2022-12-16 16:20:18 +08:00 |
|
|
tanghucheng
|
2749e26670
|
Merge branch 'zenops_46_tanghucheng' into zenops_46
|
2022-12-16 15:58:35 +08:00 |
|
|
tanghucheng
|
3d3d9a3ef4
|
* Fix bug #30962,30965.
|
2022-12-16 15:15:42 +08:00 |
|
|
tanghucheng
|
1c3537c8c6
|
Merge branch 'zenops_46_tanghucheng' into zenops_46
|
2022-12-16 12:51:32 +08:00 |
|
|
tanghucheng
|
06061a1b57
|
* Update testtask runNode.
|
2022-12-16 12:49:28 +08:00 |
|
|
tanghucheng
|
1078a9f3e7
|
* Adjust code for run ztf script.
|
2022-12-16 09:47:06 +08:00 |
|
|
tanghucheng
|
1505cb89e4
|
* Fix check autocase for batch run case.
|
2022-12-16 09:26:09 +08:00 |
|
|
tanghucheng
|
f71dfb3086
|
* Adjust code function confirmAction for testtask betchRun.
|
2022-12-15 23:24:52 +08:00 |
|
|
tanghucheng
|
772c31f7f9
|
* Adjust code for testtask batchRun.
|
2022-12-15 23:01:12 +08:00 |
|
|
tanghucheng
|
fabfcb34e4
|
* Fix issue for zanode.
|
2022-12-15 21:10:14 +08:00 |
|
|
tanghucheng
|
85ffa23da8
|
Merge branch 'master' into zenops_46_tanghucheng
|
2022-12-15 15:27:59 +08: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 |
|
|
tanghucheng
|
ef3f7a32d2
|
* Finish task #78647.
|
2022-12-15 10:00:48 +08:00 |
|
|
tanghucheng
|
a454682370
|
* Finish task #78643.
|
2022-12-14 14:16:49 +08: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 |
|
|
唐胡成
|
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 |
|
|
tanghucheng
|
ba12988150
|
* Add sql for zanode.
|
2022-12-09 09:59:23 +08: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 |
|
|
tanghucheng
|
3d5ff064db
|
* Move successModal to common.
|
2022-12-07 16:18:57 +08: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 |
|
|
tanghucheng
|
185d280025
|
* Code for task #78645.
|
2022-12-06 17:25:03 +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 |
|
|
tanghucheng
|
c397bfb177
|
* Update sql.
|
2022-12-05 10:58:09 +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
|
ff66528a4e
|
Merge branch 'zenops_46' into zenops_46_tanghucheng
|
2022-12-02 08:34:22 +08:00 |
|
|
tanghucheng
|
319f587f77
|
* Finish task #77679.
|
2022-12-02 08:33:22 +08:00 |
|
|
唐胡成
|
6a19c0e8e5
|
Merge branch 'zenops_46' into 'zenops_46_tanghucheng'
# Conflicts:
# module/zahost/js/inithost.js
|
2022-11-30 03:06:05 +00:00 |
|
|
tanghucheng
|
f9d2dd760c
|
* Finish task #77672.
|
2022-11-30 11:03:48 +08:00 |
|
|
tanghucheng
|
7daee4a6f2
|
* Finish task #77673.
|
2022-11-30 11:01:35 +08:00 |
|
|
tanghucheng
|
81505a483a
|
* Modify the popover style for create ZAhost.
|
2022-11-30 08:36:56 +08:00 |
|
|
tanghucheng
|
63928b13ab
|
* Code for task #77672.
|
2022-11-29 14:29:11 +08:00 |
|
|
tanghucheng
|
cd0454845e
|
Merge branch 'zenops_46' into zenops_46_tanghucheng
|
2022-11-29 14:25:20 +08: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
|
d631c980c3
|
* Merge branch 'zenops_46_tanghucheng' into zenops_46.
|
2022-11-29 09:36:26 +08:00 |
|