 李玉春
|
c4e8fba0f9
|
Merge branch 'zenops_46_wangjianhua_68266' into 'zenops_46'
Create VM template.
See merge request easycorp/zentaopms!5311
|
2022-09-13 05:52:10 +00:00 |
|
|
wangjianhua
|
6d3d643d09
|
* Improve codes format.
|
2022-09-13 13:42:10 +08:00 |
|
|
wangjianhua
|
03fa6a1321
|
* Create virtual host template.
|
2022-09-11 09:03:10 +08:00 |
|
|
wangjianhua
|
557bf8e9a6
|
* Fix bugs of creating zahost.
|
2022-09-10 11:44:46 +08:00 |
|
|
liyuchun
|
7d775ec0ff
|
* Add fields.
|
2022-09-09 17:02:48 +08:00 |
|
|
liyuchun
|
d7522b8c6a
|
* Adjsut zahost browse.
|
2022-09-09 16:50:27 +08:00 |
|
|
liyuchun
|
1477a67043
|
* Add create host button.
|
2022-09-09 16:26:14 +08:00 |
|
|
liyuchun
|
3180cbf395
|
* Finish task #68263.
|
2022-09-09 16:12:49 +08:00 |
|
|
liyuchun
|
e1f7aca129
|
Merge branch 'zenops_46_wangjianhua_68262' into zenops_46
|
2022-09-09 13:05:58 +08:00 |
|
|
李玉春
|
0a7ac9eb69
|
Merge branch 'zenops_46' into 'zenops_46_wangjianhua_68262'
# Conflicts:
# db/update17.6.1.sql
# module/common/lang/menu.php
|
2022-09-09 05:04:21 +00:00 |
|
|
wangjianhua
|
3fb006faf4
|
* Fix comment.
|
2022-09-09 12:08:05 +08:00 |
|
|
wangjianhua
|
797f97b5f7
|
* Remove spaces.
|
2022-09-09 11:22:34 +08:00 |
|
|
wangjianhua
|
91f2b18964
|
* Improve error message.
|
2022-09-09 10:46:06 +08:00 |
|
|
liyuchun
|
c77b970a80
|
* Code for task #68263.
|
2022-09-09 08:35:42 +08:00 |
|
|
wangjianhua
|
0e49fb125b
|
* Add privileges of zahost.
|
2022-09-08 21:51:57 +08:00 |
|
|
wangjianhua
|
1ead77b5e7
|
* Validate data of zahost before create it.
|
2022-09-08 21:06:04 +08:00 |
|
|
wangjianhua
|
036670d6f4
|
* Add zahost module.
|
2022-09-08 14:59:08 +08:00 |
|
|
liyuchun
|
0886f38dcd
|
* Add type filed.
|
2022-09-07 14:43:49 +08:00 |
|
|
wangyidong
|
249913cd5a
|
* code for bug #68205.
|
2022-09-06 14:01:41 +08:00 |
|
|
李玉春
|
ae32e44f5b
|
Merge branch 'sprint/wangzemei/25515' into 'master'
* Fix datatable bug about bug#25515
See merge request easycorp/zentaopms!5270
|
2022-09-06 05:54:30 +00:00 |
|
|
王怡栋
|
19d5097ff3
|
Merge branch 'sprint/daitingting_optimize' into 'master'
* Optimize codes.
See merge request easycorp/zentaopms!5269
|
2022-09-06 05:44:51 +00:00 |
|
|
wangzemei
|
f2c8790dbb
|
* Fix datatable bug about bug#25515
|
2022-09-06 05:37:01 +00:00 |
|
|
daitingting
|
dc0ecc890e
|
* Optimize codes.
|
2022-09-06 05:26:47 +00:00 |
|
|
sunguangming
|
6e6f1b0800
|
* Alter recordestimate view to 5 lines.
|
2022-09-06 11:08:28 +08:00 |
|
|
王怡栋
|
a1e31e99e3
|
Merge branch 'master_xieqiyu_66957' into 'master'
* Code for task#68109.
See merge request easycorp/zentaopms!5266
|
2022-09-06 02:57:03 +00:00 |
|
|
王怡栋
|
fabd055dc1
|
Merge branch 'master_xieqiyu_67693' into 'master'
* Finish task#67693.
See merge request easycorp/zentaopms!5267
|
2022-09-06 02:52:14 +00:00 |
|
|
xieqiyu
|
36dc478de5
|
* Finish task#67693.
|
2022-09-06 10:21:24 +08:00 |
|
|
wangyidong
|
19a69c8cae
|
* code for task #67405.
|
2022-09-06 09:30:22 +08:00 |
|
|
xieqiyu
|
8db8c3974b
|
* Code for task#68109.
|
2022-09-06 08:55:35 +08:00 |
|
|
wangyidong
|
08ad00b091
|
* fix bug #25049.
|
2022-09-06 08:54:36 +08:00 |
|
|
孙广明
|
a321b87f1c
|
Merge branch 'sprint/237_liumengyi_fixbug' into 'master'
* Fix bug #26298, #25695, #27192, #25409, #27020, #23401.
See merge request easycorp/zentaopms!5262
|
2022-09-06 00:42:27 +00:00 |
|
|
liumengyi
|
6a2deee711
|
* Fix bug for task #67727.
|
2022-09-06 08:39:49 +08:00 |
|
|
liumengyi
|
83f22d69a2
|
t pMerge branch 'sprint/237_liumengyi_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/237_liumengyi_fixbug
|
2022-09-06 08:30:24 +08:00 |
|
|
liumengyi
|
aaa08018f5
|
* Fix bug #23401.
|
2022-09-06 08:30:09 +08:00 |
|
|
liumengyi
|
1451a11129
|
* Fix bug #67926.
|
2022-09-06 08:29:05 +08:00 |
|
|
wangyidong
|
81223fe4c5
|
* adjust for report workload.
|
2022-09-05 20:36:01 +08:00 |
|
|
wangyidong
|
6972110d54
|
* adjust for delete estimate.
|
2022-09-05 20:21:18 +08:00 |
|
|
liumengyi
|
796d0423bc
|
* Fix bug #27020.
|
2022-09-05 16:30:02 +08:00 |
|
|
wangyidong
|
303cede555
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-09-05 16:01:46 +08:00 |
|
|
wangyidong
|
1a0afdd6e0
|
* fix bug #26541.
|
2022-09-05 16:01:13 +08:00 |
|
|
王怡栋
|
d033de2303
|
Merge branch 'sprint/tianshujie_case' into 'master'
* Add and modify test case of execution module.
See merge request easycorp/zentaopms!5265
|
2022-09-05 07:46:17 +00:00 |
|
|
王怡栋
|
7cc59a9177
|
Merge branch 'sprint/237_tianshujie_bug' into 'master'
Sprint/237 tianshujie bug
See merge request easycorp/zentaopms!5264
|
2022-09-05 07:45:45 +00:00 |
|
|
tianshujie
|
f15b266dc1
|
* Add and modify test case of execution module.
|
2022-09-05 15:43:24 +08:00 |
|
|
liumengyi
|
ed38cf6969
|
* Fix bug #25409.
|
2022-09-05 14:31:53 +08:00 |
|
|
tianshujie
|
1078a4ebc9
|
* Fix bug #24830.
|
2022-09-05 14:21:35 +08:00 |
|
|
liumengyi
|
b0a7a8bfd7
|
* Modify css for task #67925.
|
2022-09-05 14:07:51 +08:00 |
|
|
wangyidong
|
1562e2c4a8
|
* fix bug #26543.
|
2022-09-05 14:06:56 +08:00 |
|
|
wangyidong
|
c8c544c6d0
|
* adjust for record estimate.
|
2022-09-05 13:55:22 +08:00 |
|
|
wangyidong
|
4f170236c3
|
* fix bug #27262.
|
2022-09-05 13:33:56 +08:00 |
|
|
tianshujie
|
dd1feb1a04
|
* Fix bug #24894.
|
2022-09-05 13:25:01 +08:00 |
|