Commit Graph

441 Commits

Author SHA1 Message Date
wangyidong
148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
liuhong
db48df1bb5 *Fix feedback #1133 for waterfall project choose stagefilteri with Related pages. 2022-10-19 05:09:01 +00:00
daitingting
41fbaa71f9 * Finish task #71566,#71577. 2022-10-17 09:02:29 +00:00
王怡栋
c943f77c80 Merge branch 'zentaopms_239' into 'zentaopms_239_task#71585'
# Conflicts:
#   module/testtask/model.php
2022-10-10 09:22:39 +00:00
sunguangming
9a32b08644 * Fix bug #28393. 2022-10-10 16:41:39 +08:00
daitingting
f8259297b7 * Finish task #71585,#71586,#71587. 2022-10-10 05:46:31 +00:00
sunguangming
541b100471 * Fix bug #28339,#28326. 2022-10-10 13:21:39 +08:00
wangyidong
0e12fd8930 * code for task #71610. 2022-10-10 10:25:04 +08:00
wangyidong
d1f5709027 * code for task #71610. 2022-10-10 10:22:13 +08:00
liugang
11f0ca4453 * Optimize the method getPairs of the product module. 2022-09-21 11:10:34 +08:00
liugang
6b3e0329e2 * If the product is a shadow one hide it when create a testtask. 2022-09-21 08:42:00 +08:00
liugang
cb9c662a97 * Use the product's name instead of the product's name if the product is a shadow one. 2022-09-20 17:50:07 +08:00
liumengyi
24a5917b4a * Fix issue #714. 2022-08-05 10:08:28 +08:00
liumengyi
02a3c130c0 * Fix bug for task #63455. 2022-08-04 13:37:17 +08:00
tianshujie
32af972947 * Fix bug #24533. 2022-06-29 15:25:38 +08:00
tianshujie
f994051ea8 * Finish task #58552. 2022-06-28 12:16:11 +08:00
tianshujie
70b01098ac * Finish task #58552. 2022-06-27 17:22:49 +08:00
孙广明
7c7a364102 * Finish task #56635. 2022-06-13 14:28:57 +08:00
孙广明
753a5e557a * Finish task #56635. 2022-06-13 11:11:01 +08:00
孙广明
b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明
b528156589 * Change license. 2022-06-08 09:34:46 +08:00
xieqiyu
d93f2aca36 * Fix bug#23159. 2022-06-06 00:35:16 +08:00
xieqiyu
d5f294fd7b * Fix bug#23159. 2022-06-02 04:25:09 +08:00
liumengyi
1b89018e2f * Optimized code for task #55684, #55683. 2022-05-31 13:55:59 +08:00
liumengyi
04d79592c4 * Finish task #55684. 2022-05-31 13:44:05 +08:00
tanghucheng
d3dc4ebe43 * Fix bug. 2022-05-17 06:00:26 +00:00
mayue
96b422d247 * Fix bug #22411. 2022-05-12 08:41:39 +00:00
xieqiyu
4ff65cf031 * Fix bug#18072. 2022-04-11 13:18:41 +08:00
xieqiyu
d8ef00183b * Fix bug#17296. 2022-04-06 13:47:49 +08:00
孙华伟
0ed070fd28 Optimize the code. 2022-03-31 15:52:15 +08:00
孙华伟
5c9862a129 *Fix bug#15288. 2022-03-31 15:48:53 +08:00
tianshujie
84aaab5508 * Fix bug #16607. 2022-03-29 15:00:12 +08:00
zhouxudong
995c88a678 * Fix bug #20112. 2022-03-18 11:57:22 +08:00
zhouxin
1140f79663 Fix bug #18306. 2022-03-15 09:07:58 +00:00
孙广明
7b962c4e38 Merge branch 'pailei' 2022-03-07 10:56:26 +08:00
孙广明
6873b1061f Merge branch 'sprint/185_xieqiyu_49304' into 'pailei'
Sprint/185 xieqiyu 49304

See merge request easycorp/zentaopms!2007
2022-03-01 07:04:26 +00:00
xieqiyu
74326a3331 * Optimize the code. 2022-03-01 14:40:00 +08:00
王怡栋
38ed825461 * adjust for get testtask list. 2022-03-01 13:58:00 +08:00
liumengyi
e0814cd74b * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:15:08 +08:00
hufangzhou
64f8980289 * Fix bug #19506. 2022-02-14 13:57:52 +08:00
李玉春
e6db39683a Merge branch 'devops21_zhangzilong_19319' into 'master'
# Fix bug #19319.

See merge request easycorp/zentaopms!1782
2022-02-14 03:28:55 +00:00
zhangzilong
bb828d54cf * Code for bug #19319. 2022-02-14 11:13:24 +08:00
zhangzilong
dcdfb0cdee * Fix bug #19319. 2022-02-14 10:32:12 +08:00
zhouxudong
0e5f623acc *Finish task #48844. 2022-02-11 16:10:32 +08:00
zhouxudong
8af167a379 *Finish task #48844. 2022-02-11 13:04:08 +08:00
孙广明
3ab13aa61e Merge branch 'sprint/182_songchenxuan_action_lang' into 'master'
*Case action lang.

See merge request easycorp/zentaopms!1322
2022-01-11 00:36:32 +00:00
songchenxuan
bb13431274 *Fix bug 18074. 2022-01-11 08:34:55 +08:00
liumengyi
cc3c90291d * Finish task #47483. 2022-01-10 17:32:31 +08:00
songchenxuan
3e5df731bc *Fix bug #18074. 2022-01-06 17:32:48 +08:00
孙广明
c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00