Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
28,887 Commits 2 Branches 292 Tags
e3549fe24c8d84d9c4bc2da1e9e7a1edd8720321
Commit Graph
736 Commits
Author SHA1 Message Date
tianshujie 16251869b4 * Modify the SQL statement linked to the query story plan. 2021-11-11 09:10:38 +08:00
zhujinyong 37b486ad1c * Replace htmlspecialchars to htmlSpecialString for compatibility. 2021-11-10 14:57:48 +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
hufangzhou 1d7c3b30c5 * Fix bug #16065. 2021-11-08 17:14:35 +08:00
hufangzhou c027028759 * Finish task #43899. 2021-11-08 16:44:42 +08:00
hufangzhou 9f27d5918b * Fix bug #16062. 2021-11-08 16:29:22 +08:00
xieqiyu eb8300049f * Fix bug. 2021-11-08 15:07:05 +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
hufangzhou d8baf1d3fa * Add the last plan lang item. 2021-11-04 13:42:51 +08:00
hufangzhou af5b6ff489 * Finish task #43899. 2021-11-04 11:48:22 +08:00
hufangzhou 8b1b92bdfc * Add the version. 2021-11-02 12:37:51 +08:00
zhengrunyu 4f5c9691a3 *Finish task #43708. 2021-11-01 14:12:39 +08:00
zhengrunyu d7418db734 *Finish task #43708. 2021-11-01 14:07:11 +08:00
zhengrunyu 594eae2a3f * Finish task #43708. 2021-11-01 10:33:20 +08:00
zhengrunyu bd765c6881 * Finish task #43708. 2021-11-01 10:27:34 +08:00
zhengrunyu da27ff9c06 * Finish task #43708 2021-11-01 10:08:36 +08:00
zhengrunyu 0ae939a806 1 2021-11-01 09:52:09 +08:00
孙广明 0a8de60c4e Merge branch 'sprint/169_zhouxin_43617' into 'sprint/169' 
Finish task #43617.

See merge request easycorp/zentaopms!229
 2021-10-29 07:17:58 +00:00
zhouxin 4f1126ada7 Finish task #43617. 2021-10-29 11:28:41 +08:00
孙广明 f1fbcdf74e Merge branch 'sprint/169_tanghucheng_43619' into 'sprint/169' 
Finish task #43619,63620

See merge request easycorp/zentaopms!220
 2021-10-29 02:28:44 +00:00
tanghucheng 162846d43f * Finish task #43619,43620. 2021-10-29 10:22:56 +08:00
tanghucheng 8d1e5cd785 * Finish task #43619,43620. 2021-10-29 09:17:57 +08:00
zhouxin 26cc334d95 Finish task #43618. 2021-10-28 10:37:01 +08:00
hufangzhou 52e49919d2 * Code for bug #15518. 2021-10-14 13:51:59 +08:00
tianshujie d6cea498cd * Finish task #43206. 2021-10-12 10:33:07 +08:00
hufangzhou bf78fe9be4 * Add the 15.6 version and upgrade. 2021-10-12 09:35:39 +08:00
王怡栋 96a8ef6b04 Merge branch '15.5' into 165 2021-10-09 10:06:05 +08:00
liyuchun 9b5a28392b * Finish task #42854. 2021-09-28 12:31:59 +08:00
hufangzhou 7603337d74 * Fix bug #15235. 2021-09-17 15:44:06 +08:00
孙广明 6b53c5380b * Fix productplan back link. 2021-09-14 10:06:11 +08:00
tianshujie 0a7f3469e2 * Fix bug #14957. 2021-09-09 16:58:24 +08:00
zhujinyong 4ca4f1457c + Add release and productplan entry point. 2021-09-09 13:58:27 +08:00
王怡栋 26ee9677ce * finish task #42394. 2021-09-08 13:04:27 +08:00
tianshujie 1d87bcb08b * Fix bug #14890. 2021-09-03 10:50:31 +08:00
王怡栋 4eee4d5523 Merge branch '15.4' 2021-09-02 19:21:30 +08:00
liyuchun bdf1f1d7d6 * Code for task #41764. 2021-08-29 22:50:36 +08:00
王怡栋 6f3a39f334 * fix for pager for browse plan. 2021-08-24 17:37:26 +08:00
tianshujie98 d4d23232f4 * Finish task #41740. 2021-08-24 13:42:07 +08:00
孙广明 802d7a2c89 * Finish task #41731. 2021-08-20 15:32:35 +08:00
qiyu-xie ffa740828a * Finish task#41610. 2021-08-18 15:35:47 +08:00
leiyong 63038c836c * Finish task#40904. 2021-08-10 15:31:33 +08:00
wangyidong 3bfa1df846 * fix bug #13954. 2021-07-30 10:48:14 +08:00
zhujinyong 1677574443 * return before $this->send. 2021-07-16 09:40:41 +08:00
wangyidong cefd614900 * fix bug and adjust for createLink params. 2021-06-29 14:31:58 +08:00