Commit Graph
106 Commits
Author SHA1 Message Date
zhouxudong e827209fe0 * Fix bug #16718. 2022-03-22 16:37:09 +08:00
tianshujie 57da5c00a9 * Fix bug #20503. 2022-03-09 10:47:16 +08:00
孙广明 6873b1061f Merge branch 'sprint/185_xieqiyu_49304' into 'pailei'
Sprint/185 xieqiyu 49304

See merge request easycorp/zentaopms!2007
2022-03-01 07:04:26 +00:00
xieqiyu 74326a3331 * Optimize the code. 2022-03-01 14:40:00 +08:00
xieqiyu 9fa66c3d0f * Code for task#49304. 2022-02-24 14:40:14 +08:00
zhengrunyu 069f009b6d *Finish task 49283 2022-02-17 14:34:11 +08:00
songchenxuan 1c8df7822a *Finish task #46100. 2021-12-22 10:48:55 +08:00
孙广明 c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
李玉春 a99419f0c5 Merge branch 'master' into 'sprint/174_tianshujie_45081'
# Conflicts:
#   module/product/control.php
#   module/story/view/batchedit.html.php
2021-11-29 08:03:38 +00:00
hufangzhou 0965e74d0e * Finish task #45085. Fix bug #16792. 2021-11-29 13:19:55 +08:00
tianshujie 1d93fa0cd9 * Modify the scope of the linked plan when creating and editing stories. 2021-11-25 10:30:22 +08:00
hufangzhou cb78fa20e1 * Modify the nav in edit story. 2021-11-24 10:51:54 +08:00
hufangzhou 76392d18b4 * Fix an error for batch edit story. 2021-11-24 09:52:49 +08:00
zhujinyong 80010bb881 * Adjust batchEdit of story. 2021-11-23 19:46:35 +08:00
tianshujie eca1559259 * Fix code error. 2021-11-22 15:33:04 +08:00
tianshujie 76bd965626 * Modify the code. 2021-11-22 15:16:51 +08:00
tianshujie f6797fe2ea * Modify the code. 2021-11-22 15:11:20 +08:00
tianshujie a6246e8ad6 * Fix bug #16533. 2021-11-22 15:02:04 +08:00
tianshujie 69842996d6 * Fix bug #16533. 2021-11-22 13:45:44 +08:00
tianshujie 22fdf1f0fc * Modify code. 2021-11-18 14:48:21 +08:00
liumengyi cac426bb7d * Fix bug #16390,#16388. 2021-11-17 17:49:32 +08:00
tianshujie d268587e8d * Finish task #44496. 2021-11-16 15:07:18 +08:00
tianshujie 7fb8685e04 * Fix the problem of reporting errors in batch editing stories. 2021-11-11 16:01:51 +08:00
tianshujie f6f75dace2 * Modify the issue of batch and zero editing stories. 2021-11-11 14:49:34 +08:00
tianshujie edd64950ab * Fix the problem of reporting errors on the batch editing story page. 2021-11-11 13:44:27 +08:00
tianshujie c5779575c1 * Modify code logic. 2021-11-08 09:29:45 +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
liyuchun 1b8e9f4a71 * Finish task #42377. 2021-09-09 10:06:16 +08:00
zhujinyong 664e290f97 * Rename openApp to tab. 2021-08-31 00:30:48 +08:00
liyuchun 6a93618b84 * Code for task #41764. 2021-08-30 09:43:13 +08:00
wangyidong fa4fa5941e Merge branch '15.0' 2021-07-06 19:28:30 +08:00
wangyidong 74f01e94bb * finish task #38705. 2021-06-22 11:36:26 +08:00
王怡栋 8c9c237236 Merge branch '15.0.beta3' into 'master'
15.0.beta3

See merge request easycorp/zentaopms!2
2021-06-18 02:17:49 +00:00
hufangzhou 0dd6c819a9 * Adjust the code. 2021-06-16 17:26:01 +08:00
holan20180123 51cf208621 * Adjust batch edit story. 2021-06-16 15:37:06 +08:00
wangyidong 769e6b433b * merge from 15.0.beta3. 2021-06-05 13:01:53 +08:00
holan20180123 de5ab48818 * Adjust logic of hidden stage field. 2021-06-04 13:57:20 +08:00
tianshujie98 2dc084e911 * Modify the required item prompt language item. 2021-06-02 10:25:21 +08:00
qiyu-xie 087b4a3c62 * Finish task#38172. 2021-05-13 15:14:10 +08:00
holan20180123 ecc74b68a3 * Finish task #37931. 2021-05-06 15:24:27 +08:00
qiyu-xie 9442e1d82f * Fix bug#11741,#11740. 2021-04-06 10:55:01 +08:00
hufangzhou de99085844 * Fix bug #11699. 2021-04-01 16:43:01 +08:00
zhujinyong c869d88cc2 * Fix css style of *.html.php 2021-03-10 23:35:56 +08:00
hufangzhou 417cc0d800 * Finish task#8661. 2020-12-17 08:45:26 +08:00
Yagami 11bc9076ac * Code for task #7825. 2020-09-07 14:18:32 +08:00
wangyidong af6a2f26bc * code for batchcreate and batchedit with flow. 2020-05-29 13:45:41 +08:00
chenfei c7395c8b44 * Merge zentaopms_cmmi to zentaopms_12.0.1 2020-02-17 14:02:00 +08:00
wangyidong e8e1357b90 * finish task #6601. 2019-11-28 09:45:28 +08:00
liugang 2bf5424cb0 * Use function processStatus to get status of a record. 2019-07-30 11:09:44 +08:00