Commit Graph
264 Commits
Author SHA1 Message Date
孙广明 c4140ad766 * Fix code details. 2021-12-31 13:18:32 +08:00
李玉春 2bb6bb8825 Merge branch 'refactor' into 'master'
Refactor

See merge request easycorp/zentaopms!1229
2021-12-31 04:25:42 +00:00
孙广明 ad25920cf0 * Refactor code. 2021-12-31 11:06:46 +08:00
liumengyi 3dd747f40a * Modify judgment for split chid plan. 2021-12-31 10:59:37 +08:00
孙广明 101be0c103 * Finish task #46671. 2021-12-31 09:53:32 +08:00
liumengyi e0d72a4c25 * Refactoring code for update status. 2021-12-31 09:40:46 +08:00
孙广明 7af8683be4 Merge branch 'sprint/181_liumengyi_addChildLabel' into 'master'
* Modify print label code of plan list.

See merge request easycorp/zentaopms!1212
2021-12-30 08:33:36 +00:00
liumengyi abd52e3141 * Modify print label code of plan list. 2021-12-30 16:25:32 +08:00
孙广明 e9c8da2f1e * Finish task #46670. 2021-12-30 16:04:32 +08:00
孙广明 9b2df17e26 Merge branch 'sprint/181_liumengyi_addDynamic' into 'master'
* Add dynamic for parent plan status flow.

See merge request easycorp/zentaopms!1191
2021-12-30 03:53:41 +00:00
孙广明 d6296cf071 Merge branch 'sprint/181_tianshujie_46672' into 'master'
*Finish task #46672.

See merge request easycorp/zentaopms!1188
2021-12-30 03:30:11 +00:00
liumengyi 53aa300744 * Add dynamic for parent plan status flow. 2021-12-30 11:25:57 +08:00
tianshujie 08723126ea * Finish task #46672. 2021-12-30 11:02:42 +08:00
孙广明 d4d7ef1074 Merge branch 'master' into 'sprint/181_zhengrunyu_46662'
# Conflicts:
#   module/productplan/lang/en.php
#   module/productplan/lang/zh-cn.php
#   module/productplan/view/browse.html.php
2021-12-30 01:17:44 +00:00
zhengrunyu d28dcd7d63 *Finish task 46662 46665 46669. 2021-12-30 09:01:44 +08:00
孙广明 7b23296aa0 Merge branch 'sprint/181_liumengyi_fixbug' into 'master'
* Modify plan status flow judgment method.

See merge request easycorp/zentaopms!1180
2021-12-29 09:16:30 +00:00
liumengyi 1250dca867 * Modify plan flow button. 2021-12-29 17:13:16 +08:00
liumengyi ba9f61de07 * Modify plan status flow judgment method. 2021-12-29 16:31:46 +08:00
songchenxuan c483052818 *Fix plan bug. 2021-12-29 15:50:49 +08:00
tianshujie 510547f7ea * Fix the real-time update of the Kanban board. 2021-12-29 10:41:05 +08:00
tianshujie 15c13057d0 * Adjust the query plan logic. 2021-12-29 09:36:57 +08:00
tianshujie 830f551425 * Modify the code. 2021-12-28 17:12:30 +08:00
tianshujie 6a6322044e Merge branch 'sprint/181_tianshujie_kanban' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/181_tianshujie_kanban 2021-12-28 16:59:36 +08:00
tianshujie 545438e452 * Finisht task #46666,#46668,#46659,#46658. 2021-12-28 16:56:38 +08:00
liumengyi 36e9b91ba0 * Finish task #46660. 2021-12-28 15:11:27 +08:00
tianshujie 593cabd96c * Modify variable name. 2021-12-27 17:20:47 +08:00
tianshujie 27319feba9 * Finish task #46657. 2021-12-27 17:11:29 +08:00
songchenxuan a7258e471b *Finish task #46100. 2021-12-22 14:28:28 +08:00
songchenxuan 72a6d27e6c *Finish task #46095. 2021-12-21 13:48:40 +08:00
songchenxuan 30cd7944ff *Finish task #46095. 2021-12-21 09:55:50 +08:00
songchenxuan c9c65ce3ef *Finish task #46095. 2021-12-21 09:16:56 +08:00
songchenxuan 65e41ae440 *Finish task #46095. 2021-12-20 18:13:23 +08:00
songchenxuan ca1230076f *Finish task #46095. 2021-12-20 18:10:40 +08:00
songchenxuan 1bbb985b3e *Finish task #46095. 2021-12-20 13:44:41 +08:00
xieqiyu a978d41365 * Code for bug#17503. 2021-12-14 15:47:19 +08:00
xieqiyu ed9eedf543 * Fix bug#17503. 2021-12-14 14:27:26 +08:00
朱金勇 efdadc07a7 Merge branch 'sprint/176_mayue_45544' into 'master'
* Finish a task #45544.

See merge request easycorp/zentaopms!928
2021-12-14 05:34:42 +00:00
mayue 77d36b7467 * Finish a task #45544. 2021-12-14 09:49:46 +08:00
朱金勇 161233a64f Merge branch 'sprint/176_xieqiyu_45536' into 'master'
Sprint/176 xieqiyu 45536

See merge request easycorp/zentaopms!884
2021-12-10 06:15:15 +00:00
xieqiyu 7a482c5f6a * Fix bug#17251. 2021-12-09 10:25:23 +08:00
xieqiyu 821fd3644c * Code for task#45536. 2021-12-08 18:48:33 +08:00
xieqiyu b9a474901f * Fix bug#17251. 2021-12-08 16:13:42 +08:00
mayue 99e725ef37 * Finish task #45544. 2021-12-08 13:25:50 +08:00
李玉春 64c603d9d5 Merge branch 'sprint/174_tianshujie_task' into 'master'
* Restore code.

See merge request easycorp/zentaopms!680
2021-12-01 03:31:45 +00:00
zhujinyong d8cefe71d9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-01 10:01:02 +08:00
zhujinyong 74a4cd7470 + Add productplan methods for api. 2021-12-01 10:00:06 +08:00
tianshujie b7513e7fde * Restore code. 2021-11-30 17:47:01 +08:00
tianshujie eda9acb2ae * Search plan drop-down range when modifying linked stories and bugs. 2021-11-30 16:46:36 +08:00
孙广明 c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
tianshujie 0c33d76709 * Finish task #45081. 2021-11-29 17:14:01 +08:00