Commit Graph
450 Commits
Author SHA1 Message Date
hufangzhou 32c7a078a7 * Fix the code error. 2021-12-09 10:34:47 +08:00
liumengyi f0e55ad2a4 * Fix bug #17227. 2021-12-09 10:34:47 +08:00
孙广明 87c24eae5a Merge branch 'sprint/174_hufangzhou_action' into 'master'
* Fix the code error.

See merge request easycorp/zentaopms!817
2021-12-08 00:55:02 +00:00
hufangzhou 5c53afeeed * Fix the code error. 2021-12-08 08:47:00 +08:00
liumengyi 07cd32ed75 * Fix bug #17227. 2021-12-07 18:11:43 +08:00
liyuchun f6301e4c9a Merge branch 'sugon' 2021-12-01 16:48:00 +08:00
liumengyi bba0c40dfe * Fix bug #16882, #16924. 2021-12-01 11:25:02 +08:00
孙广明 c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
孙广明 e5a9358acd Merge branch 'sprint/29_zhouxin_45106' into 'sprint/168'
Finish task #45106.

See merge request easycorp/zentaopms!649
2021-11-30 05:11:52 +00:00
zhouxin 2fa0124ed8 Finish task #45106. 2021-11-30 04:27:11 +00:00
liumengyi bd6a007e6a * Add comment. 2021-11-30 10:55:51 +08:00
liumengyi 4b9ee832e1 * Add comment. 2021-11-30 10:20:50 +08:00
liumengyi 3e346ef8d9 * Modify refactor. 2021-11-30 09:31:08 +08:00
liumengyi 62907853b4 * Finish task #45156. 2021-11-30 09:10:42 +08:00
liumengyi f164f0cdd0 * Fix bug #16892. 2021-11-29 15:19:19 +08:00
liumengyi a3f5e8ab43 * Fix bug #16892. 2021-11-29 15:18:12 +08:00
zenggang 7a53ada4b3 * Fix bug#16734 2021-11-26 03:00:16 +00:00
王怡栋 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
dingguodong 9536d3caa8 * Fill in the missing code of action module for MR review. 2021-11-11 14:05:47 +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
liyuchun 6ce13b1e17 * Fix bug #15928. 2021-11-03 08:57:46 +08:00
liyuchun 4936056465 * Fix bug #15907. 2021-11-02 09:15:53 +08:00
hufangzhou 200801ebee * Add the dynamic for moving swimlane. 2021-11-01 15:51:30 +08:00
王怡栋 3cdf3b3395 Merge branch 'sprint/167_wangyidong_api' into sprint/app10 2021-11-01 15:35:49 +08:00
liyuchun d0b9dda4d7 * Finish task #43519,#43503. 2021-10-27 15:41:36 +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