Commit Graph

416 Commits

Author SHA1 Message Date
liumengyi
53aa300744 * Add dynamic for parent plan status flow. 2021-12-30 11:25:57 +08:00
zhouxin
32bb53370c Fix bug #17711. 2021-12-22 06:01:35 +00:00
hufangzhou
5b0923a7a3 * Resolve the issue of merge branch. 2021-12-22 10:07:18 +08:00
hufangzhou
9743ebbb92 * Finish task #46388. 2021-12-21 22:26:07 +08:00
zhujinyong
42fc345e2a Merge branch 'sprint/176_xieqiyu_mergeBranch' 2021-12-21 16:12:48 +08:00
hufangzhou
872a8b2bbd * Finish task #46096. 2021-12-21 14:30:38 +08:00
孙广明
3db6c1bf1e * Code for trashes. 2021-12-20 15:40:02 +08:00
孙广明
84fae4bc7d Merge branch 'kanban' 2021-12-20 10:59:07 +08:00
zhujinyong
72b41be5b0 - Remove die() of action module. 2021-12-20 09:05:16 +08:00
liumengyi
23bec4a9ed * Modify code format. 2021-12-20 08:43:34 +08:00
liumengyi
79c523399b * Modify kanban judgment in recycle bin. 2021-12-20 08:28:18 +08:00
liumengyi
7d3ad08bc6 * Finish task #46158, and fix bug #17657,#17655. 2021-12-17 15:39:41 +08:00
xieqiyu
fde47bebb6 * Fix bug#17516. 2021-12-14 16:56:59 +08:00
tianshujie
cc414d4e14 * Fix Kanban dynamic issue. 2021-12-13 17:45:42 +08:00
zhujinyong
ad8b03c73f * Refactoring of getDynamic. 2021-12-13 11:03:58 +08:00
tianshujie
5d7a3c9215 * Add dynamic link. 2021-12-10 14:24:16 +08:00
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