Commit Graph

1461 Commits

Author SHA1 Message Date
Yagami
26fc535d82 * Finish task #78677. 2022-12-09 13:44:31 +08:00
wangyidong
e4b9ef4536 * fix bug #30585. 2022-12-08 09:56:31 +08:00
wangyuting
2bd28233ea * Fix bug #30429. 2022-12-01 06:28:13 +00:00
王 于听
c96f03c532 Merge branch 'master' into 'zentaopms_266_bug#30341'
# Conflicts:
#   module/testtask/control.php
2022-11-30 07:38:45 +00:00
wangyuting
a125f33c4d * Fix bug #30368. 2022-11-30 07:27:01 +00:00
wangyuting
89edb08198 * Fix bug #30341. 2022-11-30 06:41:40 +00:00
王怡栋
49f74f8f77 Merge branch 'zentaopms266_wyd' into 'master'
Zentaopms266 wyd

See merge request easycorp/zentaopms!6416
2022-11-30 06:07:34 +00:00
wangyidong
8efd793e38 * adjust for getBuildPairs method. 2022-11-30 14:04:32 +08:00
wangyuting
5c176595e4 * Finish task #77610. 2022-11-30 01:46:45 +00:00
wangyuting
fc51e379f0 * Finish task #77611. 2022-11-28 05:22:22 +00:00
王怡栋
58eed1be72 Merge branch 'master_oss_wangjianhua' into 'master'
Modify file module to support OSS plug.

See merge request easycorp/zentaopms!6367
2022-11-24 06:50:16 +00:00
xieqiyu
e6e37d4b20 * Fix bug#30032. 2022-11-23 16:17:01 +08:00
wangjianhua
d6b292ae14 Merge branch 'master' into master_oss_wangjianhua 2022-11-21 21:20:34 +08:00
xieqiyu
80e19fe5e1 * Fix bug#29789. 2022-11-21 14:57:58 +08:00
wangjianhua
121e072d85 Merge branch 'master' into master_oss_wangjianhua 2022-11-16 16:36:36 +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
wangjianhua
cd5749835e * Add function setFielAndRealPaths to file model. 2022-11-09 23:28:37 +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