Commit Graph
378 Commits
Author SHA1 Message Date
王怡栋 fde5cb61da Merge branch 'sprint/app10' into sprint/170 2021-11-19 08:41:00 +08:00
李玉春 3870f6f9e4 Merge branch 'sprint/170_zhouxin_44486,44487,44488' into 'sprint/170'
Finis task #44486,44487,44488.

See merge request easycorp/zentaopms!495
2021-11-18 06:30:03 +00:00
xieqiyu 7d15430ab1 * Modify the review code. 2021-11-18 10:39:46 +08:00
xieqiyu 84340fa6f2 * Code for task#44497. 2021-11-17 22:57:30 +08:00
zhouxin b7e3fe9003 Finis task #44486,44487,44488. 2021-11-17 15:49:24 +08:00
王怡栋 d68ce78a66 * code for task #44325. 2021-11-16 14:40:42 +08:00
zhujinyong 37b486ad1c * Replace htmlspecialchars to htmlSpecialString for compatibility. 2021-11-10 14:57:48 +08:00
xieqiyu 089238bd79 * Modify review questions. 2021-11-10 12:26:55 +08:00
王怡栋 87d1d09997 * adjust for get dropmenu by api. 2021-11-10 11:34:16 +08:00
hufangzhou 9fa76f6912 * Modify the action of main branch. 2021-11-10 09:49:29 +08:00
qiyu-xie 8f902ccf2d * Code fot task#44028. 2021-11-07 13:44:24 +08:00
王怡栋 3cdf3b3395 Merge branch 'sprint/167_wangyidong_api' into sprint/app10 2021-11-01 15:35:49 +08:00
王怡栋 43ac494106 * fix bug for loophole. 2021-10-25 08:42:13 +08:00
tianshujie 0b7c4c5f1c * Fix bug #15638. 2021-10-19 20:18:42 +08:00
tianshujie adef615386 * Fix bug #15638. 2021-10-19 19:41:05 +08:00
tianshujie ab662e5cf4 * Fix bug #15511. 2021-10-14 13:31:08 +08:00
王怡栋 96a8ef6b04 Merge branch '15.5' into 165 2021-10-09 10:06:05 +08:00
tianshujie 33ec8312e3 * Finish task #42867. 2021-10-08 13:50:25 +08:00
王怡栋 9211504ebb * fix bug #15357. 2021-09-26 15:16:28 +08:00
hufangzhou 8bbf7475f8 * Fix bug #14231. 2021-09-22 09:02:31 +08:00
tianshujie 00619a268f * Fix dynamic error. 2021-09-16 09:04:36 +08:00
dingguodong 4a4afa23d9 * Rename function for display action(JIHU). 2021-09-10 08:53:13 +08:00
liyuchun fa2e8cd1b0 * Fix bug #15004. 2021-09-09 14:43:41 +08:00
dingguodong e9002f78c2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-08 16:33:36 +08:00
dingguodong 47b838ddb5 * Merge code from ext to this branch for API(JIHU). 2021-09-08 16:33:05 +08:00
liyuchun a03a74fd5b * Fix bug #15004. 2021-09-08 16:01:41 +08:00
liyuchun 21b5e77382 * Fix bug #15004. 2021-09-08 15:52:00 +08:00
tianshujie 881a6e8ec5 * Fix bug #14162. 2021-09-01 16:48:30 +08:00
王怡栋 cdb85dcf8b * fix for set object link. 2021-09-01 11:30:47 +08:00
王怡栋 ac455fd310 * finish task #41531. 2021-08-29 11:23:51 +08:00
王怡栋 193667e18a * finish task #41794. 2021-08-29 11:18:48 +08:00
tianshujie98 1fd161ec33 * Modify the judgment of printing stakeholder links. 2021-08-23 14:42:21 +08:00
tianshujie98 6fdb4fd97f * Finish task #41721. 2021-08-23 14:39:58 +08:00
王怡栋 2dadc9122b * finish task #41530. 2021-08-20 14:01:38 +08:00
王怡栋 4c841a2f23 * finish task #41529. 2021-08-20 13:58:50 +08:00
zenggang 962728e04d * Adjust code style 2021-08-19 16:08:40 +08:00
hufangzhou 15133464e9 * Finish task #41532. 2021-08-18 16:47:35 +08:00
hufangzhou 5237f1649c * Fix bug #14289. 2021-08-16 09:14:56 +08:00
hufangzhou 4d3e4aa7f5 * Fix bug #14266. 2021-08-13 13:55:15 +08:00
qiyu-xie 4acca21bde * Finish task#41217. 2021-08-11 16:55:12 +08:00
王怡栋 f5caade0e4 * fix bug for fulltext search and action. 2021-08-11 13:57:55 +08:00
tianshujie98 9fe092394b * Fix dynamic issues during upgrade. 2021-08-06 17:15:52 +08:00
wangyidong c4d0eabcf3 * adjust for show pipeline in trash. 2021-08-05 16:03:46 +08:00
hufangzhou 59d8d2f3dc * Fix bug #14044. 2021-08-04 14:53:43 +08:00
hufangzhou 15bd66d47b * Fix bug #14044. 2021-08-04 14:22:59 +08:00
wangyidong 4f29e51ef0 * fix bug for create action when close story. 2021-07-27 13:30:38 +08:00
zenggang e7ac26998e * Finish task #40470 2021-07-22 16:48:02 +08:00
wangyidong 6a973517de * finish task #40306. 2021-07-16 13:43:54 +08:00
holan20180123 49892661bf * Fix product dynamic error. 2021-07-14 14:41:43 +08:00
wangyidong fa4fa5941e Merge branch '15.0' 2021-07-06 19:28:30 +08:00