Commit Graph
30572 Commits
Author SHA1 Message Date
Hao Sun 152b3e03bc * update kanban lib. 2021-11-30 14:21:14 +08:00
zenggang 354203e7c9 * Fix bug#16857 2021-11-30 06:14:53 +00: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
zenggang 6dc4aeb458 * Fix bug#16774 2021-11-30 05:59:03 +00:00
mayue cf91884c25 * Fix bug #16631. 2021-11-30 13:56:49 +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
liyuchun ac79294f8d * Fix bug #16920. 2021-11-30 13:36:37 +08: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
liyuchun 570b5c1cdb Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon 2021-11-30 12:03:29 +08: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
zenggang 5bb1d7b671 * Fix bug#16860 2021-11-30 03:08:33 +00: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
liyuchun cabe7d0062 * Fix bug #16922. 2021-11-30 11:00:47 +08:00
songchenxuan c5deb3e68d * Finish task #45028. 2021-11-30 10:57:49 +08:00
zhengrunyu 46a9f157b1 *Finish task #45148. 2021-11-30 10:56:09 +08:00
liumengyi bd6a007e6a * Add comment. 2021-11-30 10:55:51 +08:00
mayue f2d867870a * Finish task #44987,44988,44989. 2021-11-30 10:55:41 +08:00
songchenxuan 9efa9b1759 * Finish task #45018. 2021-11-30 10:49:38 +08:00
李玉春 d37bced9ee Merge branch 'sprint/175_liumengyi_16907' into 'sprint/168'
* Fix bug 16807,16892.

See merge request easycorp/zentaopms!658
2021-11-30 02:47:03 +00:00
李玉春 106f5cfcd3 Merge branch 'sprint/174_hufangzhou_tree' into 'master'
* Solve the problem of mutual testing for task #45085.

See merge request easycorp/zentaopms!659
2021-11-30 02:46:09 +00:00
hufangzhou 7a5a4d5807 * Rebuild the code. 2021-11-30 10:44:37 +08:00
zenggang 67a17333a4 * Fix bug#16849 2021-11-30 02:40:59 +00:00
mayue d89aa24c8c * Finish task #44987,44988,44989. 2021-11-30 10:32:11 +08:00
tianshujie d2f57affa6 * Finish task #45000. 2021-11-30 10:30:36 +08:00
liumengyi 4b9ee832e1 * Add comment. 2021-11-30 10:20:50 +08:00
liyuchun 2098270105 Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon 2021-11-30 10:18:38 +08:00
liyuchun b80d0643ac * Add field of zt_mr. 2021-11-30 10:18:24 +08:00
zenggang 5bbcd0bc35 * Fix bug#16849 2021-11-30 02:12:59 +00:00
tianshujie 826a99a0b7 * Finish task #45005,45007. 2021-11-30 10:12:47 +08:00