Commit Graph
904 Commits
Author SHA1 Message Date
mayue d89aa24c8c * Finish task #44987,44988,44989. 2021-11-30 10:32:11 +08:00
mayue 19d489a645 * Fix bug #44987,44988,44989. 2021-11-30 09:27:50 +08:00
tianshujie 0c33d76709 * Finish task #45081. 2021-11-29 17:14:01 +08:00
mayue 7a5c062947 * Finish task #44987,44988,44989. 2021-11-29 16:15:50 +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
mayue a77510b311 * Finish task #44987,44988,44989. 2021-11-29 15:11:16 +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
chaideqing 74f7a95902 * optimize zentao buglist/storylist/tasklist show when in xuanxuan card 2021-11-29 14:55:14 +08: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
hufangzhou 63bc9f80c4 * Fix bug #16509. 2021-11-22 14:11:13 +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
hufangzhou 21faa0dc2a * Finish task #44361. 2021-11-18 11:30:28 +08: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
hufangzhou 6e1f7dfbf7 * Finish task #44361. 2021-11-17 18:06:48 +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
hufangzhou 0d39951950 * Code for task #44361. 2021-11-17 16:14:53 +08:00
zhouxin b7e3fe9003 Finis task #44486,44487,44488. 2021-11-17 15:49:24 +08:00
tanghucheng 939023de6d * Finish task #44023 for max. 2021-11-15 10:19:35 +08:00
孙广明 70c1981893 * Fix bug #16059. 2021-11-12 11:23:35 +08:00
孙广明 a075c72531 * Fix execution update order. 2021-11-12 09:28:37 +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
李玉春 900de67361 Merge branch 'sprint/171_sgm_43998' into 'sprint/168'
* Finish task #43998.

See merge request easycorp/zentaopms!376
2021-11-10 02:35:22 +00:00
tianshujie fb7f493036 * Modify the error code. 2021-11-10 09:58:49 +08:00
孙广明 6d625bb597 * Finish task #43998. 2021-11-10 09:43:04 +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
liyuchun 00d9bc4d7f * Sort execution kanban. 2021-11-09 17:22:42 +08:00
liyuchun cec2fd2c42 * Finish task #43960. 2021-11-09 16:42:22 +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
孙广明 870b311f06 * Fix errors. 2021-11-08 16:32:18 +08:00