Commit Graph
29466 Commits
Author SHA1 Message Date
tianshujie 96a46aa2ca * Modify the code. 2021-11-29 14:16:10 +08:00
tianshujie f2b60bda9e * Finish task #45011. 2021-11-27 19:17:38 +08:00
tianshujie 0690823866 * Finish task #45030. 2021-11-27 18:58:33 +08:00
tianshujie 582f0e036d * Finish task #45043. 2021-11-27 18:14:41 +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
tianshujie 7810fbc629 * Finish task #45081. 2021-11-26 14:59:02 +08:00
tianshujie 8bf6c34acd * Modify the logic of planning related stories and bugs. 2021-11-26 13:37:15 +08:00
tianshujie ba63ff33bf * Transfer the stories and bugs of the parent plan to the child plan. 2021-11-25 18:22:29 +08:00
tianshujie 774ee347f5 * Translate modified code. 2021-11-25 17:57:24 +08:00
tianshujie f342b1a219 * Modify search stories and bug issues. 2021-11-25 13:29:04 +08:00
tianshujie 3816d9a775 * Modify the scope of linked stories and bugs in the plan. 2021-11-25 13:16:20 +08:00
tianshujie 4f4a1f990b * Modify the logic of changing branches in stories. 2021-11-25 11:28:50 +08:00
tianshujie 1d93fa0cd9 * Modify the scope of the linked plan when creating and editing stories. 2021-11-25 10:30:22 +08:00
王怡栋 fb8ff15c2a Merge branch 'sprint/170_package_bug' 2021-11-25 08:34:16 +08:00
王怡栋 d589065650 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-11-25 08:34:08 +08:00
王怡栋 d9ee0bfbf7 Merge branch 'master' into 'sprint/170_package_bug'
# Conflicts:
#   module/mr/model.php
2021-11-25 00:32:52 +00:00
王怡栋 eec4c536f5 Merge branch 'sprint/170' into 'master'
Sprint/170

See merge request easycorp/zentaopms!611
2021-11-25 00:31:51 +00:00
tianshujie 179e766478 * Modify function name. 2021-11-24 16:45:08 +08:00
hufangzhou 97d1a037dd Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_package_bug 2021-11-24 11:26:46 +08:00
hufangzhou 4e2cda3a82 * Fix an error for edit story. 2021-11-24 11:26:43 +08:00
zhengrunyu 2d168bf7e8 *Finish task 16602. 2021-11-24 11:00:21 +08:00
songchenxuan 838c8c8efb Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170_package_bug 2021-11-24 10:52:13 +08:00
hufangzhou c1792262cf Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_package_bug 2021-11-24 10:51:57 +08:00
hufangzhou cb78fa20e1 * Modify the nav in edit story. 2021-11-24 10:51:54 +08:00
songchenxuan 7fc99d65fd * Fix bug 16696. 2021-11-24 10:51:49 +08:00
xieqiyu 0c633c71d6 * Fix a bug:There is an error on the suite use case page. 2021-11-24 10:22:12 +08:00
xieqiyu ccb9327c5a * Fix bug#16565. 2021-11-24 10:11:54 +08:00
hufangzhou 7d50d0bb9a Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_package_bug 2021-11-24 10:04:55 +08:00
hufangzhou f15477ae01 * Fix an error of modules in product module for batch edit story. 2021-11-24 10:04:52 +08:00
xieqiyu 501e80ddf2 * Fix bug#16606. 2021-11-24 10:03:09 +08:00
songchenxuan fc0e55a418 * Fix bug #16656. 2021-11-24 10:00:59 +08:00
hufangzhou c6e999ecdc Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_package_bug 2021-11-24 09:52:51 +08:00
hufangzhou 76392d18b4 * Fix an error for batch edit story. 2021-11-24 09:52:49 +08:00
songchenxuan 77d7e7c440 * Fix bug #16655,16656,16657. 2021-11-24 09:41:39 +08:00
hufangzhou 3cbdfdcb6f Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_package_bug 2021-11-24 09:38:23 +08:00
hufangzhou 6f4e21aed1 * Code for bug #16578. 2021-11-24 09:38:21 +08:00
songchenxuan ea45481a2a * Fix bug #16654. 2021-11-24 09:24:17 +08:00
songchenxuan 55b762b8b9 * Fix bug #16654. 2021-11-24 09:09:06 +08:00
zhujinyong 0d520d03d3 Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170_package_bug 2021-11-23 19:47:10 +08:00
zhujinyong 80010bb881 * Adjust batchEdit of story. 2021-11-23 19:46:35 +08:00
朱金勇 5b84227610 Merge branch 'spring/170_xiawenlong' into 'sprint/170'
* Fix code error

See merge request easycorp/zentaopms!603
2021-11-23 11:16:20 +00:00
xiawenlong ace43eb90d * Fix code error 2021-11-23 19:11:03 +08:00
xieqiyu 15867e4fd3 * Fix bug#16638. 2021-11-23 19:05:34 +08:00
zhouxin 2b3df26fd8 Fix bug 16564. 2021-11-23 18:47:56 +08:00
zhengrunyu 16873a8154 *Finish task #16619. 2021-11-23 17:50:26 +08:00
tianshujie e4f00ca20e Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_package_bug 2021-11-23 17:39:03 +08:00
tianshujie d8d277842b * Fix bug #16549. 2021-11-23 17:38:43 +08:00
xieqiyu 35bdfa9376 * Fix bug#16565. 2021-11-23 17:33:10 +08:00