Commit Graph
30302 Commits
Author SHA1 Message Date
liyuchun e6ece3beab * Finish task #45152. 2021-12-01 10:01:20 +08:00
liyuchun 9e5f01dd7b * Finish task #45152. 2021-12-01 09:59:13 +08:00
liyuchun 3149307967 * Finish task #45152. 2021-12-01 09:50:16 +08:00
王怡栋 fc591306b5 * code for task #45297. 2021-12-01 09:17:20 +08:00
李玉春 8b6bacdcfd Merge branch 'sprint/174_xieqiyu_45004' into 'master'
* Finish task#45004.

See merge request easycorp/zentaopms!682
2021-12-01 00:43:03 +00:00
xieqiyu b3e9bd7e61 * Delete unused code. 2021-12-01 08:42:20 +08:00
李玉春 06a2e03018 Merge branch 'sprint/174_xieqiyu_45015' into 'master'
* Finish task#45015.

See merge request easycorp/zentaopms!681
2021-12-01 00:40:33 +00:00
xieqiyu 4c0eb137da * Finish task#45004. 2021-11-30 19:43:49 +08:00
xieqiyu 49be608156 * Finish task#45015. 2021-11-30 18:28:51 +08:00
李玉春 63b0c9be3c Merge branch 'sprint/174_xieqiyu_fixbug' into 'master'
* Fix bug for batch edit story and bug in project.

See merge request easycorp/zentaopms!678
2021-11-30 09:31:56 +00:00
李玉春 493d55e8ef Merge branch 'sprint/174_tianshujie_task' into 'master'
* Search plan drop-down range when modifying linked stories and bugs.

See merge request easycorp/zentaopms!677
2021-11-30 09:30:49 +00:00
tianshujie 7cff062d2e * Adjust code style of model tree. 2021-11-30 17:29:05 +08:00
tianshujie be15ba6045 * Fix the module tree under execution. 2021-11-30 17:24:11 +08:00
xieqiyu d0afac5593 * Fix bug for batch edit story and bug in project. 2021-11-30 17:10:12 +08:00
tianshujie eda9acb2ae * Search plan drop-down range when modifying linked stories and bugs. 2021-11-30 16:46:36 +08:00
liyuchun 64be419604 Merge branch 'sprint/174_xieqiyu_45080' 2021-11-30 15:45:11 +08:00
李玉春 dbc186a0c4 Merge branch 'master' into 'sprint/174_xieqiyu_45080'
# Conflicts:
#   module/story/control.php
#   module/story/view/header.html.php
#   module/testcase/control.php
2021-11-30 07:44:47 +00:00
xieqiyu 70d8039750 * Add comment. 2021-11-30 15:31:10 +08:00
xieqiyu 888fbfe73b * Code for task#45080. 2021-11-30 15:05:16 +08:00
李玉春 a4426db6f0 Merge branch 'sprint/174_tianshujie_45081' into 'master'
* Fix bug #16939 and modify the scope of the plan when editing bugs.

See merge request easycorp/zentaopms!672
2021-11-30 06:45:48 +00:00
李玉春 cb03696c8a Merge branch 'sprint/174_songchenxuan_45019' into 'master'
* Finish task #45019.

See merge request easycorp/zentaopms!671
2021-11-30 06:45:00 +00:00
tianshujie 03cb9122ef * Adjust code style of bug module. 2021-11-30 14:44:48 +08:00
孙广明 c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
tianshujie 508d7d78bf * Fix bug #16939 and modify the scope of the plan when editing bugs. 2021-11-30 14:14:14 +08:00
songchenxuan a8b2009bad * Finish task #45019. 2021-11-30 14:00:37 +08:00
孙广明 801c9ce3d0 Merge branch 'sprint/169' into sprint/168 2021-11-30 13:47:05 +08:00
李玉春 0ab2f6d249 Merge branch 'sprint/174_tianshujie_45007' into 'master'
* Modify use case branch query conditions.

See merge request easycorp/zentaopms!667
2021-11-30 05:39:08 +00:00
李玉春 c30c1466d0 Merge branch 'sprint/174_songchenxuan_45028' into 'master'
* Finish task #45028.

See merge request easycorp/zentaopms!662
2021-11-30 05:19:03 +00:00
李玉春 392463cace Merge branch 'sprint/168_sgm_45161' into 'sprint/168'
Sprint/168 sgm 45161

See merge request easycorp/zentaopms!641
2021-11-30 05:16:08 +00:00
李玉春 2d1e0bb3dc Merge branch 'sprint/168_sgm_45160' into 'sprint/168'
* Finish task #45160.

See merge request easycorp/zentaopms!664
2021-11-30 05:15:34 +00:00
孙广明 e5a9358acd Merge branch 'sprint/29_zhouxin_45106' into 'sprint/168'
Finish task #45106.

See merge request easycorp/zentaopms!649
2021-11-30 05:11:52 +00:00
孙广明 9e9c024982 * Adjust lang. 2021-11-30 13:10:51 +08:00
孙广明 d58fb3c8e7 * Add lang and comment. 2021-11-30 13:08:17 +08:00
李玉春 4b223ec01b Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master'
* Finish task #44987,44988,44989.

See merge request easycorp/zentaopms!657
2021-11-30 05:02:41 +00:00
zhouxin 2fa0124ed8 Finish task #45106. 2021-11-30 04:27:11 +00:00
songchenxuan b0ad71231c * Finish task #45028. 2021-11-30 11:31:27 +08:00
孙广明 e752382609 * Remove unused code. 2021-11-30 11:30:50 +08:00
mayue 71387b1d37 * Finish task #44987,44988,44989. 2021-11-30 11:26:48 +08:00
李玉春 0322f02b54 Merge branch 'sprint/174_songchenxuan_45018' into 'master'
* Finish task #45018.

See merge request easycorp/zentaopms!661
2021-11-30 03:19:57 +00:00
李玉春 adb7b76f3c Merge branch 'sprint/174_songchenxuan_45049' into 'master'
Sprint/174 songchenxuan 45049

See merge request easycorp/zentaopms!643
2021-11-30 03:19:07 +00:00
tianshujie 2a469dc6f7 * Modify use case branch query conditions. 2021-11-30 11:17:10 +08:00
李玉春 86927c21ad Merge branch 'sprint/175_liumengyi_16924' into 'sprint/168'
* Fix bug #16924.

See merge request easycorp/zentaopms!666
2021-11-30 03:16:42 +00:00
李玉春 ca91fc11f1 Merge branch 'sprint/174_tianshujie_45007' into 'master'
* Finish task #45005,45007.

See merge request easycorp/zentaopms!660
2021-11-30 03:16:27 +00:00
孙广明 4fef5fc188 Merge branch 'sprint/168_zhengrunyu_45148' into sprint/168 2021-11-30 11:13:44 +08:00
孙广明 f89071b9e7 Merge branch 'sprint/168' into 'sprint/168_zhengrunyu_45148'
# Conflicts:
#   module/execution/view/view.html.php
2021-11-30 03:13:21 +00:00
李玉春 2786d77fcb Merge branch 'sprint/174_tianshujie_task' into 'master'
* Finish task #45081,45012.

See merge request easycorp/zentaopms!655
2021-11-30 03:12:42 +00:00
liumengyi 7dc88ef740 * Fix bug #16924. 2021-11-30 11:11:54 +08:00
孙广明 38619abdd8 * Finish task #45160. 2021-11-30 11:08:33 +08:00
李玉春 c3ea85771d Merge branch 'sprint/175_liumengyi_45156' into 'sprint/168'
* Finish task #45156.

See merge request easycorp/zentaopms!639
2021-11-30 03:05:07 +00:00
songchenxuan c5deb3e68d * Finish task #45028. 2021-11-30 10:57:49 +08:00