Commit Graph

468 Commits

Author SHA1 Message Date
hufangzhou
f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
xieqiyu
83635bffc3 * Fix bug#32034. 2023-02-10 15:18:26 +08:00
Yagami
c2724b9f57 Merge branch 'zentaopms_281' 2023-02-08 15:31:13 +08:00
xieqiyu
bbf3f25c27 * Fix bug#31864. 2023-02-01 15:28:05 +08:00
liuhong
d71ca3ac54 * Fix bug #31538. 2023-01-06 04:10:54 +00:00
tanghucheng
5c2a41cdef * Fix bug #31361. 2023-01-05 12:22:00 +08:00
liuhong
e91bc365a4 * Adjust code for task #81778. 2023-01-04 01:06:36 +00:00
liuhong
2996d56fa0 * Finish task #81778. 2023-01-03 09:14:04 +00:00
tanghucheng
26d746598e * Fix bug for zanode. 2022-12-16 20:20:06 +08:00
tanghucheng
1078a9f3e7 * Adjust code for run ztf script. 2022-12-16 09:47:06 +08:00
tanghucheng
772c31f7f9 * Adjust code for testtask batchRun. 2022-12-15 23:01:12 +08:00
tanghucheng
85ffa23da8 Merge branch 'master' into zenops_46_tanghucheng 2022-12-15 15:27:59 +08:00
tanghucheng
8162ed067c * Fix issue for run ztf script. 2022-12-15 10:55:41 +08:00
tanghucheng
ef3f7a32d2 * Finish task #78647. 2022-12-15 10:00:48 +08:00
tanghucheng
a454682370 * Finish task #78643. 2022-12-14 14:16:49 +08:00
zhaoke
a8526afc5d * Add view test result. 2022-12-14 03:51:17 +00:00
wangyidong
e4b9ef4536 * fix bug #30585. 2022-12-08 09:56:31 +08:00
唐胡成
c6aafbd707 Merge branch 'zenops_46' into 'zenops_46_tanghucheng'
# Conflicts:
#   module/zanode/lang/de.php
#   module/zanode/lang/en.php
#   module/zanode/lang/fr.php
#   module/zanode/lang/zh-cn.php
#   module/zanode/model.php
2022-12-07 06:27:38 +00:00
tanghucheng
e7a96aa7d2 * Finish task #78645. 2022-12-07 14:24:05 +08:00
王 于听
c96f03c532 Merge branch 'master' into 'zentaopms_266_bug#30341'
# Conflicts:
#   module/testtask/control.php
2022-11-30 07:38:45 +00:00
wangyuting
89edb08198 * Fix bug #30341. 2022-11-30 06:41:40 +00:00
wangyidong
8efd793e38 * adjust for getBuildPairs method. 2022-11-30 14:04:32 +08:00
wangyuting
fc51e379f0 * Finish task #77611. 2022-11-28 05:22:22 +00:00
xieqiyu
e6e37d4b20 * Fix bug#30032. 2022-11-23 16:17:01 +08:00
xieqiyu
a11c4187be * Fix bug#29744. 2022-11-16 13:59:26 +08:00
王怡栋
27d66c7d13 Merge branch 'sprint/konglinmao_feedback_1355' into 'master'
* Resolved feedback #1355.

See merge request easycorp/zentaopms!6073
2022-11-08 05:01:04 +00:00
孔令茂
45fd5e6a53 * Resolved feedback #1355. 2022-11-07 06:45:21 +00:00
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