Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
32,069 Commits 2 Branches 292 Tags
541aeaba80a08321b1cdd6ef3201993232ae5c6e
Commit Graph
145 Commits
Author SHA1 Message Date
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
songchenxuan ca1230076f *Finish task #46095. 2021-12-20 18:10:40 +08:00
孙广明 13f162edd2 * Merge 169 untrack file to master. 2021-12-08 11:07:06 +08:00
王怡栋 bf16167b19 * Support for flow. 2021-12-02 10:55:04 +08:00
tianshujie 86ccece2ca * Modify the problem of function demonstration. 2021-12-01 16:32:10 +08:00
tianshujie e74dd9ad80 * Fix bug #16977. 2021-12-01 14:05:59 +08:00
孙广明 c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
tianshujie adb2c12935 * Modify the code. 2021-11-29 15:54:48 +08:00
tianshujie 96a46aa2ca * Modify the code. 2021-11-29 14:16:10 +08:00
tianshujie f4d1a727a7 * Finish task #45084,44994,44993. 2021-11-27 17:41:42 +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 1d93fa0cd9 * Modify the scope of the linked plan when creating and editing stories. 2021-11-25 10:30:22 +08:00
zhujinyong 80010bb881 * Adjust batchEdit of story. 2021-11-23 19:46:35 +08:00
xieqiyu aae0921d23 * Fix bug#16479. 2021-11-22 09:47:35 +08:00
wangjianhua fa32609ca0 * Fix bug #16477和#16485 2021-11-19 08:31:58 +00:00
wangjianhua 1e57264ff4 * finish task 44491. Load branch lang before using. 2021-11-18 09:16:07 +00:00
wangjianhua a1e07d2b4b * Finish task 44491. 2021-11-17 13:55:59 +00:00
wangjianhua f7a063e9ec * Add branch name before product plan name in product list page. 2021-11-17 05:56:48 +00:00
tianshujie 5f6bc547a3 * Fix the problem of obtaining plan. 2021-11-11 14:15:06 +08:00
tianshujie 16251869b4 * Modify the SQL statement linked to the query story plan. 2021-11-11 09:10:38 +08:00
tianshujie 9e622a2995 * Merge conflicts. 2021-11-09 16:27:06 +08:00
李玉春 98f519fe31 Merge branch 'sprint/170' into 'sprint/170_tianshujie_43901' 
# Conflicts:
#   module/branch/model.php
#   module/story/model.php
 2021-11-09 07:53:17 +00:00
tianshujie 8e9dd74c0d * Modify code logic. 2021-11-09 15:47:31 +08:00
tianshujie 5ab6fe77c2 * Modify code logic. 2021-11-09 14:21:17 +08:00
tianshujie 3986d8c297 * Add the logic of project-related multi-branch products. 2021-11-09 10:04:05 +08:00
tianshujie 0328182a47 * Modify the logic of the acquisition plan. 2021-11-05 17:19:41 +08:00
tianshujie 77da777064 * Finish task #43893. 2021-11-05 15:46:52 +08:00
hufangzhou af5b6ff489 * Finish task #43899. 2021-11-04 11:48:22 +08:00
zhouxin 4f1126ada7 Finish task #43617. 2021-10-29 11:28:41 +08:00
tianshujie d6cea498cd * Finish task #43206. 2021-10-12 10:33:07 +08:00
王怡栋 26ee9677ce * finish task #42394. 2021-09-08 13:04:27 +08:00
王怡栋 6f3a39f334 * fix for pager for browse plan. 2021-08-24 17:37:26 +08:00
wangyidong 3bfa1df846 * fix bug #13954. 2021-07-30 10:48:14 +08:00
holan20180123 7535cfe35f * Fix bug #12406. 2021-04-27 10:54:34 +08:00
wangyidong f563acb640 * adjust code. 2021-04-26 10:31:52 +08:00
holan20180123 dca05f8be2 * Finish task #8226. 2020-11-09 09:53:18 +08:00
tianshujie98 11d81b4ef1 * Edit comment. 2020-10-12 11:24:06 +08:00
holan20180123 02eb03583d * Finish task #8085. 2020-10-10 16:56:36 +08:00
tianshujie98 1ef4203498 * Finish task #8077. 2020-09-30 15:43:56 +08:00
tianshujie98 80dfeda677 * Adjust code style. 2020-09-16 15:01:20 +08:00
tianshujie98 a9013adc4e * Finish task #7994. 2020-09-16 14:55:30 +08:00
z 6aca289707 * finish task #7585. 2020-08-06 15:28:46 +08:00
shilei 8a9ece9db2 [bug修复]当计划绑定多个项目时，计划列表显示的总条数(recTotal)不正确，需进行去重处理 2019-11-29 16:16:40 +08:00
wangyidong d2c577c6f6 * fix get plan list when product is null. 2019-09-04 08:51:23 +08:00
wangyidong d29ac3a948 * code for task #6288. 2019-09-02 09:12:17 +08:00
wangyidong 253e0ab3a8 * finish task #6231. 2019-08-21 15:32:29 +08:00