Commit Graph

258 Commits

Author SHA1 Message Date
songchenxuan
cb00625795 * Finish task #45040. 2021-12-01 08:45:25 +08:00
李玉春
a99419f0c5 Merge branch 'master' into 'sprint/174_tianshujie_45081'
# Conflicts:
#   module/product/control.php
#   module/story/view/batchedit.html.php
2021-11-29 08:03:38 +00:00
tianshujie
adb2c12935 * Modify the code. 2021-11-29 15:54:48 +08:00
孙广明
5ad303eca9 Merge branch 'sprint/174_xieqiyu_45080' into 'master'
Sprint/174 xieqiyu 45080

See merge request easycorp/zentaopms!644
2021-11-29 06:58:17 +00:00
tianshujie
96a46aa2ca * Modify the code. 2021-11-29 14:16:10 +08:00
xieqiyu
763ae6ea87 * Code for task#45082. 2021-11-28 19:54:47 +08:00
tianshujie
3bddd21087 * Finish task #45083. 2021-11-27 17:58:52 +08:00
tianshujie
f4d1a727a7 * Finish task #45084,44994,44993. 2021-11-27 17:41:42 +08:00
tianshujie
066db150a4 * Solve the problem of plan creation and execution error. 2021-11-27 09:52:47 +08:00
王怡栋
c15bf759b9 * code for task #44937. 2021-11-26 10:40:54 +08:00
tianshujie
179e766478 * Modify function name. 2021-11-24 16:45:08 +08:00
tianshujie
ec5ca42e49 * Fix bug #16577. 2021-11-23 15:01:51 +08:00
李玉春
15967171de Merge branch 'sprint/173_lizhiqiang_16371' into 'sprint/170'
Fix bug#16371.

See merge request easycorp/zentaopms!513
2021-11-18 06:33:49 +00:00
李玉春
3870f6f9e4 Merge branch 'sprint/170_zhouxin_44486,44487,44488' into 'sprint/170'
Finis task #44486,44487,44488.

See merge request easycorp/zentaopms!495
2021-11-18 06:30:03 +00:00
lizhiqiang
e5653c5dd7 *Finish Bug #16371. 2021-11-18 14:21:34 +08:00
zhouxin
b658a98de3 Fix some problem. 2021-11-18 14:13:32 +08:00
孙广明
8f2c87cae1 Merge branch 'sprint/170' into 'sprint/170_tianshuejie_bug'
# Conflicts:
#   module/execution/view/create.html.php
2021-11-18 06:03:46 +00:00
李玉春
e41ccac2b7 Merge branch 'sprint/170' into 'sprint/170_mayue_branch'
# Conflicts:
#   module/build/view/create.html.php
#   module/project/model.php
2021-11-18 05:15:10 +00:00
tianshujie
7044ccbf2c * Modify logic. 2021-11-18 11:17:22 +08:00
tianshujie
e8f77ac632 * Modify logic. 2021-11-18 11:10:02 +08:00
tianshujie
4e02c5ba53 * Fix product issues during replication sprint. 2021-11-18 10:48:31 +08:00
xieqiyu
47cdcd78c0 * Code for task#44497. 2021-11-17 19:30:13 +08:00
mayue
bf7e878ae4 * Fix bug #16257. 2021-11-17 17:44:22 +08:00
mayue
9979876a0d * Fix bug #16257. 2021-11-17 16:54:16 +08:00
zhouxin
b7e3fe9003 Finis task #44486,44487,44488. 2021-11-17 15:49:24 +08:00
tianshujie
34ad92ab78 * Modify the judgment logic. 2021-11-11 17:50:47 +08:00
tianshujie
4940500fe1 * Fix the trunk display problem when execution manage products. 2021-11-11 13:59:52 +08:00
tianshujie
fb7f493036 * Modify the error code. 2021-11-10 09:58:49 +08:00
tianshujie
8174540183 * Remove useless code. 2021-11-10 09:22:08 +08:00
tianshujie
35504f6745 * Combine the acquisition branch into a function. 2021-11-10 09:17:28 +08:00
tianshujie
fe99d1fafb * Finish task #43901. 2021-11-09 19:56:48 +08:00
tianshujie
eedcc1aed5 * Modify code logic. 2021-11-09 10:28:16 +08:00
tianshujie
3986d8c297 * Add the logic of project-related multi-branch products. 2021-11-09 10:04:05 +08:00
root
24c8e0948d * Finish task 43917 2021-11-04 17:24:52 +08:00
tianshujie
d297c809b3 * Finish task #43907. 2021-11-03 15:51:04 +08:00
王怡栋
621eecf52c * adjust for execution action list. 2021-10-18 10:18:40 +08:00
王怡栋
96a8ef6b04 Merge branch '15.5' into 165 2021-10-09 10:06:05 +08:00
zenggang
336a4e5951 * Fix bug#15368 2021-09-27 15:32:22 +08:00
zenggang
6798a9cb46 * Fix bug#15280 2021-09-26 17:10:11 +08:00
tianshujie
441cda176d * Modify the global creation return link. 2021-09-15 15:56:19 +08:00
hufangzhou
85ad745929 * Add the recall in project story list, add the review and recall in execution story list. 2021-09-06 13:06:33 +08:00
王怡栋
4eee4d5523 Merge branch '15.4' 2021-09-02 19:21:30 +08:00
tianshujie
f459105129 * Modify dynamic back link problem. 2021-08-31 09:12:58 +08:00
zhujinyong
664e290f97 * Rename openApp to tab. 2021-08-31 00:30:48 +08:00
xieqiyu
e3a751acaf * Finish task#41684. 2021-08-27 21:24:41 +08:00
tianshujie
5f740be96b * Modify the test case back link problem. 2021-08-27 15:24:32 +08:00
holan20180123
0d943aae9b * Fix bug #14552. 2021-08-23 16:19:48 +08:00
王怡栋
4c841a2f23 * finish task #41529. 2021-08-20 13:58:50 +08:00
qiyu-xie
4c60d66765 * Finish task#41556. 2021-08-19 09:21:04 +08:00
qiyu-xie
1a17dd0207 * Finish task#41557. 2021-08-19 09:16:15 +08:00