Commit Graph

1446 Commits

Author SHA1 Message Date
xieqiyu
80e19fe5e1 * Fix bug#29789. 2022-11-21 14:57:58 +08:00
xieqiyu
a11c4187be * Fix bug#29744. 2022-11-16 13:59:26 +08:00
wangyidong
e2cf4aa1be * fix bug #29534. 2022-11-10 12:09:14 +08:00
wangyidong
b32f2af9b7 * code for task #75236. 2022-11-09 10:30:30 +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
wangyidong
9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
孔令茂
45fd5e6a53 * Resolved feedback #1355. 2022-11-07 06:45:21 +00:00
caoyanyi
dcdc7bd58a * Adjust code. 2022-11-07 13:49:12 +08:00
caoyanyi
e6cbdb8182 * Fix bug #28992. 2022-11-07 13:44:11 +08:00
zhouxin
cd5415309e * Resolve feedback #36186. 2022-10-31 13:21:00 +08:00
caoyanyi
0cbf110be2 * Fix bug #29047. 2022-10-27 15:37:49 +08:00
wangyidong
148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
caoyanyi
f88804a95a * Modify test task page style. 2022-10-27 09:38:47 +08:00
caoyanyi
24ac3a470a * Modify test case review style. 2022-10-27 09:36:26 +08:00
caoyanyi
b2a64e9f25 * Modify status style. 2022-10-26 13:41:39 +08:00
caoyanyi
e2a8f5a0fe * Modify view page style. 2022-10-26 09:56:57 +08:00
caoyanyi
a82cc215ba * Optimize page style. 2022-10-25 14:53:46 +08:00
王怡栋
cdb458bb9f Merge branch 'master_feedback_1133' into 'master'
*Fix feedback #1133 for waterfall project choose stagefilteri with Related pages.

See merge request easycorp/zentaopms!5796
2022-10-19 05:29:12 +00:00
liuhong
db48df1bb5 *Fix feedback #1133 for waterfall project choose stagefilteri with Related pages. 2022-10-19 05:09:01 +00:00
tianshujie
80ee6fb2b1 * Fix bug #28573. 2022-10-19 08:25:02 +08:00
daitingting
41fbaa71f9 * Finish task #71566,#71577. 2022-10-17 09:02:29 +00:00
tianshujie
80b66aea5c * Fix bug #28490. 2022-10-17 11:12:48 +08:00
tianshujie
a16db808d2 * Fix bug #28488. 2022-10-17 10:56:26 +08:00
wangyidong
19feba7933 * fix for task #71610. 2022-10-11 16:09:53 +08:00
李玉春
bd488328ab Merge branch 'sprint/gfl_71875' into 'master'
* finish task 71875

See merge request easycorp/zentaopms!5716
2022-10-11 06:52:12 +00:00
曹延义
980f4b6ee6 * Adjust code. 2022-10-11 14:09:13 +08:00
tianshujie
202be34c31 * Finish task #71888. 2022-10-11 13:50:58 +08:00
曹延义
cf23ad6c07 * Revert testtask page. 2022-10-11 13:23:59 +08:00
tianshujie
96cf29a7ef * Finish task #71888. 2022-10-11 11:27:34 +08:00
王怡栋
c943f77c80 Merge branch 'zentaopms_239' into 'zentaopms_239_task#71585'
# Conflicts:
#   module/testtask/model.php
2022-10-10 09:22:39 +00:00
王怡栋
abcdde7ea3 Merge branch 'zentaopms_239_wangyuting' into 'zentaopms_239'
* Fix systemMode bug.

See merge request easycorp/zentaopms!5710
2022-10-10 09:18:50 +00:00
sunguangming
9a32b08644 * Fix bug #28393. 2022-10-10 16:41:39 +08:00
wangyuting2
aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00: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
wangzemei
83a6a8ab53 * finish task #71885 && #71893 2022-10-10 09:58:19 +08:00
曹延义
a923a0838d * Finish task #71884. 2022-10-08 17:21:29 +08:00
wangyidong
d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
tianshujie
01c194668b * Finish task #70505. 2022-09-29 15:59:43 +08:00
tianshujie
6f599fad75 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/241_tianshujie_70008 2022-09-23 10:26:29 +08:00
liugang
b06b1d2593 * Fix bug #27787. 2022-09-22 14:05:16 +08:00
孙广明
bc4d97d825 Merge branch 'feedback_zhouxin_01' into 'master'
* Resolve feedback.

See merge request easycorp/zentaopms!5463
2022-09-22 05:21:52 +00:00
tianshujie
65ce7cb599 * Finish task #70020. 2022-09-22 10:55:46 +08:00
tianshujie
a8bdc9bc6c * Finish task #70008. 2022-09-22 09:07:11 +08:00
liugang
11f0ca4453 * Optimize the method getPairs of the product module. 2022-09-21 11:10:34 +08:00
tianshujie
23f5c939ae * Finish task #68934. 2022-09-21 10:10:14 +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
048441961b * Adjust and Remove the useless style. 2022-09-21 08:39:15 +08:00