Commit Graph
52603 Commits
Author SHA1 Message Date
zenggang f88c705e6a * Fix bug#33135 2023-03-23 02:09:38 +00:00
zhaoke 23caed765a * Fix case version error in ciresult api. 2023-03-23 08:37:35 +08:00
zhaoke c7fb972550 * Fix bug #32700. 2023-03-22 14:29:16 +08:00
zhaoke cc81f8dd43 * Fix bug #32701. 2023-03-22 14:20:26 +08:00
zhaoke 018d767604 Merge branch 'feature/42422' into zenops_66 2023-03-21 10:18:07 +08:00
zhaoke 4055ee45aa + Fix bug #33118. 2023-03-21 10:17:19 +08:00
zhaoke d9aaa1f461 * Fix bug #33114. 2023-03-21 10:14:29 +08:00
zhaoke 8c7414226c * Fix bug #33114. 2023-03-21 10:14:12 +08:00
zhaoke 7d47a91b98 Merge branch 'feature/42500' into zenops_66 2023-03-20 17:36:15 +08:00
zenggang e0e186f686 Merge branch 'zenops_67' into zenops_66 2023-03-20 03:15:17 +00:00
zenggang c6efd71426 * Finish task#86376,86375 2023-03-17 08:33:40 +00:00
wangyidong d3149400b0 * fix bug #32095. 2023-03-17 15:57:51 +08:00
王怡栋 e3c0cafc26 Merge branch 'hufangzhou_addBtn' into 'master'
*  Add close btn for requirement under project app.

See merge request easycorp/zentaopms!7227
2023-03-17 07:52:20 +00:00
王怡栋 2063d133e9 Merge branch 'hufangzhou_undefined' into 'master'
* Fix bug for undefined variable.

See merge request easycorp/zentaopms!7229
2023-03-17 07:51:59 +00:00
王怡栋 ebfe0514bd Merge branch 'devops_unjenkins' into 'master'
* Restore jenkins

See merge request easycorp/zentaopms!7231
2023-03-17 07:36:22 +00:00
zhaoke 8631c957cf * Add sync button in testcase view. 2023-03-17 15:09:36 +08:00
zenggang 2922e67a34 * Restore jenkins 2023-03-17 06:47:51 +00:00
zhaoke a718f719b4 Merge remote-tracking branch 'origin/master' into zenops_66 2023-03-17 14:47:30 +08:00
hufangzhou 9ee981f782 * Fix bug for undefined variable. 2023-03-17 14:41:10 +08:00
hufangzhou 868dda193c * Add close btn for requirement under project app. 2023-03-17 13:50:06 +08:00
孙广明 bcc9e6a0b2 Merge branch 'bugfix/33054_lmy' into 'master'
* Fix bug #33054.

See merge request easycorp/zentaopms!7224
2023-03-17 05:23:30 +00:00
wangyidong db49612b75 * fix bug #33059. 2023-03-17 13:06:38 +08:00
王怡栋 6ee765c362 Merge branch 'tsj_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!7222
2023-03-17 03:10:31 +00:00
王怡栋 e980643cd7 Merge branch 'dev/gfl_fix_bug' into 'master'
* Code for bug #33060 .

See merge request easycorp/zentaopms!7225
2023-03-17 03:09:30 +00:00
guofeilong d2f0e788fa * Code for bug #33060 . 2023-03-17 11:08:31 +08:00
tianshujie bd8dc27a36 * Code for bug #32987. 2023-03-17 11:07:00 +08:00
liumengyi d2632c11fd * Fix bug #33054. 2023-03-17 03:06:40 +00:00
zhaoke 4f2d69bbee Merge branch 'feature/42422' into zenops_66 2023-03-17 11:03:38 +08:00
zhaoke 30dc9afb0a - Remove repeat var. 2023-03-17 11:03:21 +08:00
zhaoke e4ed673953 Merge branch 'feature/42422' into zenops_66 2023-03-17 11:01:01 +08:00
zhaoke e9a89012bd Merge branch 'zenops_65' into feature/42422 2023-03-17 10:58:27 +08:00
孙广明 10a4dac396 Merge branch 'pipeline_jenkins_ly' into 'master'
Pipeline jenkins ly

See merge request easycorp/zentaopms!7223
2023-03-17 02:46:20 +00:00
zhaoke d95057d9a2 * Fix vm status error. 2023-03-17 10:42:08 +08:00
wangyidong c905c9a331 * fix for doc when upgrade. 2023-03-17 10:39:19 +08:00
tianshujie 9a3e8158dd Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-17 10:37:50 +08:00
tianshujie 2955d16b91 * Code for fix bug #27599. 2023-03-17 10:37:32 +08:00
caoyanyi 7a51621ef4 Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-17 10:19:08 +08:00
caoyanyi 872a14aa0c * Adjust code. 2023-03-17 10:18:54 +08:00
liyang 71501dbc69 * Fix xuanxuan notice. 2023-03-17 10:10:29 +08:00
tianshujie cc84152bbd Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-17 09:55:18 +08:00
tianshujie 4815187c32 * Code for fix bug #33035. 2023-03-17 09:54:59 +08:00
caoyanyi 4669b0218c * Adjust code. 2023-03-17 09:54:55 +08:00
caoyanyi 6712de8a01 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-17 09:51:21 +08:00
caoyanyi 675a28f888 * Modify editor default style. 2023-03-17 09:51:01 +08:00
王怡栋 8cb51c6118 Merge branch 'dev/gfl_fix_bug' into 'master'
* Code for bug #32973.

See merge request easycorp/zentaopms!7220
2023-03-17 01:21:39 +00:00
guofeilong ec80eedcc9 * Code for bug #32973. 2023-03-17 09:19:36 +08:00
Yagami 4c88c29318 * Fix bug #33009. 2023-03-17 09:14:07 +08:00
zhaoke 1f5f93d583 * Fix bug #32870. 2023-03-17 09:00:16 +08:00
孙广明 5a69ec2c98 Merge branch 'wxp_bug32706' into 'master'
* Fix bug 32706.

See merge request easycorp/zentaopms!7195
2023-03-17 00:52:21 +00:00
孙广明 d9470a5d73 Merge branch 'wxp_bug23998' into 'master'
# Fixed #bug23998.

See merge request easycorp/zentaopms!7213
2023-03-17 00:52:09 +00:00