Commit Graph
1066 Commits
Author SHA1 Message Date
tanghucheng 62c1ed7f9c Merge branch 'master' into zenops_46 2022-12-30 09:40:04 +08:00
孙广明 137953e0ae Merge branch 'zentaopms_277' 2022-12-30 08:45:34 +08:00
tanghucheng 63779ca808 * Finish story #41213. 2022-12-29 19:21:40 +08:00
王怡栋 4af7ffbfa9 Merge branch 'sprint/konglinmao_optimize_code2' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!6640
2022-12-27 08:48:41 +00:00
孔令茂 610e22f948 * Optimize code. 2022-12-27 08:45:32 +00:00
hufangzhou 3a51b751ef * Add the new Version. 2022-12-27 00:54:30 +00:00
liugang 8100689bb2 Merge branch 'sprint/biz17' 2022-12-26 08:50:31 +08:00
孙广明 19d93a07d6 * Add ticket api. 2022-12-22 14:30:12 +08:00
tanghucheng 85ffa23da8 Merge branch 'master' into zenops_46_tanghucheng 2022-12-15 15:27:59 +08:00
hufangzhou 6cef691b39 * Add the new version. 2022-12-14 05:28:51 +00:00
tanghucheng ee6a173837 Merge branch 'zenops_46' into zenops_46_tanghucheng 2022-12-14 09:27:49 +08:00
zhaoke e20513b242 * Add ztf submit result api. 2022-12-12 08:33:45 +00:00
tanghucheng e11ec7993c Merge branch 'zenops_46' into sprint/220 2022-12-09 13:49:30 +08:00
zhouxin f41dc323bf * Fix filter of base64. 2022-12-07 06:58:26 +00:00
tanghucheng ee2fed7a28 * Finish task #79050. 2022-12-06 13:40:26 +08:00
zhaoke 9b18d2e750 * Add submit task 2022-12-02 07:56:40 +00:00
caoyanyi faad718cad * Validate data of zahost before create it. 2022-11-29 13:30:44 +08:00
孙广明 d4f5170391 Merge branch 'zenops_46_zhaoke_74993' into 'zenops_46'
Zenops 46 zhaoke 74993

See merge request easycorp/zentaopms!6395
2022-11-28 06:58:42 +00:00
caoyanyi 7272593f0b Merge branch 'master' into sprint/220 2022-11-25 13:52:26 +08:00
caoyanyi 4361cb4182 Merge branch 'master' into zenops_46 2022-11-24 13:01:30 +08:00
wangyuting 2399c0060b * Fix bug #30202. 2022-11-24 03:09:57 +00:00
zhaoke c2b0f0a656 * Update zanode name 2022-11-23 02:44:27 +00:00
caoyanyi 0d81c7f4fe Merge branch 'master' into zenops_46 2022-11-22 15:39:59 +08:00
zhujinyong 4fe716f2c7 + Add TABLE_SCREEN. 2022-11-22 00:15:00 +08:00
liugang 7c62eef9dc Merge branch 'master' into sprint/biz17 2022-11-21 13:08:59 +08:00
zhaoke 65adccbff9 * Update for sql change. 2022-11-21 00:56:54 +00:00
xieqiyu 930b60756e * Fix bug#29678. 2022-11-18 13:45:38 +08:00
xieqiyu a2db4e6f77 * Fix bug#29677. 2022-11-18 13:36:33 +08:00
tianshujie 31246ae5e9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin 2022-11-17 15:41:26 +08:00
caoyanyi b40d86d219 Merge branch 'master' into zenops_46 2022-11-17 14:42:05 +08:00
liugang 3171c65b1f * Fix bug #29905. 2022-11-17 09:25:28 +08:00
hufangzhou 3dae19302b * Add the new version. 2022-11-16 06:34:29 +00:00
liugang 66a85dc546 * Add the dataview table. 2022-11-14 15:26:38 +08:00
tianshujie 16d055bf8d * Finish task #76108. 2022-11-14 13:49:28 +08:00
caoyanyi f1425eff27 Merge branch 'master' into zenops_46 2022-11-14 08:55:13 +08:00
tianshujie 718817d9fa Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin 2022-11-11 14:48:03 +08:00
wangyuting 3c36bfbb70 * Fix bug #29593. 2022-11-11 01:38:47 +00:00
zhaoke 0f6ba1160f Merge branch 'zenops_46_wangjianhua_74990' into zenops_46_zhaoke_74993 2022-11-11 01:04:34 +00:00
wangjianhua 38b5b41a64 * Add image list page of zahost module. 2022-11-11 08:58:23 +08:00
tianshujie 7500c5a61d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin 2022-11-11 08:45:55 +08:00
zhaoke dfa13273c0 * Add execnode table. 2022-11-10 08:24:13 +00:00
zhaoke 7550e05863 * Add init host page. 2022-11-10 08:02:07 +00:00
wangyidong a5b9f374d1 * merge git stash. 2022-11-10 15:50:17 +08:00
tianshujie 2e2127c53a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin 2022-11-10 13:30:26 +08:00
tianshujie f37ca78f61 * Add actions of program list. 2022-11-10 10:07:26 +08:00
tianshujie 0ad559a413 * Finish task #73291. 2022-11-09 17:16:43 +08:00
tianshujie 51a786f73d * Finish task #73291. 2022-11-08 14:33:53 +08:00
zhujinyong a65662436d Merge branch 'sprint/biz17' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/biz17 2022-11-08 14:09:44 +08:00
caoyanyi 1630ab8885 Merge branch 'master' into zenops_46 2022-11-08 09:24:42 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00