Commit Graph
47953 Commits
Author SHA1 Message Date
王怡栋 1db91b628a Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix bug #29442#29695

See merge request easycorp/zentaopms!6258
2022-11-18 08:28:55 +00:00
王怡栋 29cddd773a * fix bug #75779. 2022-11-18 16:25:14 +08:00
lanzongjun 8ef4f02bf8 * Fix bug #29442#29695 2022-11-18 15:38:59 +08:00
王怡栋 9274950e61 Merge branch 'tanghucheng_fixbug' into 'master'
* Fix bug #24065,23090.

See merge request easycorp/zentaopms!6256
2022-11-18 07:24:22 +00:00
王怡栋 c14659e8d8 Merge branch 'zentaopms_258_bug#28221' into 'master'
* Fix bug #28221.

See merge request easycorp/zentaopms!6254
2022-11-18 07:23:35 +00:00
王怡栋 d8f5a8bb60 Merge branch 'tianshujie_css' into 'master'
* Modify the execution name width problem in the execution list.

See merge request easycorp/zentaopms!6253
2022-11-18 07:23:13 +00:00
王怡栋 28f7de276c Merge branch 'master_xieqiyu_76490' into 'master'
* Fix bug#29677.

See merge request easycorp/zentaopms!6252
2022-11-18 07:22:17 +00:00
王怡栋 7961c8bc55 Merge branch 'master_feedback_1468' into 'master'
Master feedback 1468

See merge request easycorp/zentaopms!6251
2022-11-18 07:22:01 +00:00
王怡栋 68eb73e7ff Merge branch 'zentaopms_261_bug_#29977' into 'master'
* Fix bug #29977.

See merge request easycorp/zentaopms!6250
2022-11-18 07:21:02 +00:00
王怡栋 c4c367d34a Merge branch 'cyy_bug' into 'master'
* Fix bug #29974.

See merge request easycorp/zentaopms!6249
2022-11-18 07:20:38 +00:00
王怡栋 350d74575e Merge branch 'master_xieqiyu_29990' into 'master'
* Fix bug#29990.

See merge request easycorp/zentaopms!6248
2022-11-18 07:20:08 +00:00
王怡栋 abfdcaa4f5 Merge branch 'zentaopms_261_bug_#29948' into 'master'
* Fix bug #29948.

See merge request easycorp/zentaopms!6247
2022-11-18 07:19:49 +00:00
王怡栋 c291211ac9 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix task #76459

See merge request easycorp/zentaopms!6246
2022-11-18 07:19:36 +00:00
xieqiyu de8cfb9fec * Fix bug#29997. 2022-11-18 15:19:18 +08:00
王怡栋 47dd0a2a4d Merge branch 'zentaopms_258_bug#29942' into 'master'
* Fix bug #29942.

See merge request easycorp/zentaopms!6245
2022-11-18 07:19:03 +00:00
lanzongjun 0b2bb1a273 * Fix bug #29442#29695 2022-11-18 15:18:57 +08:00
王怡栋 a8e22a8884 Merge branch 'zentaopms_261_bug_#29653' into 'master'
* Fix bug #29653.

See merge request easycorp/zentaopms!6244
2022-11-18 07:18:49 +00:00
王怡栋 6164fa0c69 Merge branch 'zentaopms_258_bug#29959' into 'master'
* Fix bug #29959.

See merge request easycorp/zentaopms!6243
2022-11-18 07:18:30 +00:00
王怡栋 07117610a7 Merge branch 'zentaopms_261_bug_#29931' into 'master'
* Fix bug #29931.

See merge request easycorp/zentaopms!6242
2022-11-18 07:17:53 +00:00
王怡栋 988f80e133 Merge branch 'zentaopms261_wyd' into 'master'
* adjust for create release.

See merge request easycorp/zentaopms!6257
2022-11-18 07:10:55 +00:00
王怡栋 07c1b0cc45 * adjust for create release. 2022-11-18 15:09:21 +08:00
lanzongjun 35fd254797 * Fix bug create execution 2022-11-18 14:57:52 +08:00
tanghucheng 2607d0e3ac * Fix bug #24065,23090. 2022-11-18 14:56:56 +08:00
王怡栋 8aeb743c8f Merge branch 'zentaopms261_wyd' into 'master'
Zentaopms261 wyd

See merge request easycorp/zentaopms!6255
2022-11-18 06:42:59 +00:00
wangyuting a5488a96c9 * Fix bug #28221. 2022-11-18 06:42:14 +00:00
Yagami 427d5947c5 * Fix bug #29443. 2022-11-18 14:41:25 +08:00
caoyanyi c038cce9b5 * Modify feedback for test case import. 2022-11-18 14:34:20 +08:00
王怡栋 1c0129945c * code for task #76439,76440. 2022-11-18 14:25:24 +08:00
lanzongjun da5f7e860b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-11-18 14:07:23 +08:00
tianshujie 22b1c539f6 * Modify the execution name width problem in the execution list. 2022-11-18 14:00:34 +08: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
caoyanyi 38c7d708f1 * Modify repo branch style. 2022-11-18 13:06:29 +08:00
daitingting 50975af558 * Fix bug #29977. 2022-11-18 04:02:20 +00:00
liuhong ef32ff16ec * Adjust code for feedback #1468 2022-11-18 03:51:12 +00:00
caoyanyi f551d44dc8 * Modify pri style. 2022-11-18 11:26:18 +08:00
caoyanyi 8e74c1b335 Merge branch 'master' into cyy_bug 2022-11-18 11:24:23 +08:00
caoyanyi fa03cbe0fc * Fix bug #29974. 2022-11-18 11:23:33 +08:00
xieqiyu 22499f1f96 * Fix bug#29990. 2022-11-18 11:22:09 +08:00
daitingting 8bc0455d36 * Fix bug #29948. 2022-11-18 03:21:58 +00:00
lanzongjun a105dc7845 * Fix task #76459 2022-11-18 11:17:09 +08:00
liuhong 1b10f6141a * Fix bug foe feedback #1468 2022-11-18 03:10:12 +00:00
wangyuting ff6730dcbd * Fix bug #29942. 2022-11-18 03:01:40 +00:00
王怡栋 fb9aa7d0dd * code for task #76438. 2022-11-18 10:57:15 +08:00
daitingting ef60d89f47 * Fix bug #29653. 2022-11-18 02:55:33 +00:00
王怡栋 db540eb67a * code for task #76438. 2022-11-18 10:53:30 +08:00
wangyuting 5df0b941b1 * Fix bug #29959. 2022-11-18 02:51:50 +00:00
朱金勇 7d92169194 Merge branch 'sprint/xuanxuan-header' into 'master'
* Hide logout and user-deny page's footer in xuanxuan client mode.

See merge request easycorp/zentaopms!6192
2022-11-18 02:43:51 +00:00
鲁飞 fa166ed6e1 * Hide logout and user-deny page's footer in xuanxuan client mode. 2022-11-18 02:43:51 +00:00
daitingting 6743a6e779 * Fix bug #29931. 2022-11-18 02:40:02 +00:00