Commit Graph
48806 Commits
Author SHA1 Message Date
Lufei d6db014f99 * Fix checkPriv error. 2022-12-08 14:00:14 +08:00
wangyidong 7c6c2cf8e6 Merge branch 'sprint/xuanxuan_127' 2022-12-08 12:24:08 +08:00
文睿 李 cb729e1864 * resolve conflict of task model, add method for task searching. 2022-12-08 03:44:50 +00:00
Wenrui LI ce8a83998c * fix zentaobot paging and command concatenation. 2022-12-08 11:38:04 +08:00
wangyidong b7dfd47433 * fix bug. 2022-12-08 11:04:55 +08:00
孙广明 95da812147 Merge branch 'master_xieqiyu_30613' into 'master'
* Fix bug#30613.

See merge request easycorp/zentaopms!6494
2022-12-08 02:50:39 +00:00
孙广明 99f18346bb Merge branch 'master_xieqiyu_78690' into 'master'
* Finish task#78690.

See merge request easycorp/zentaopms!6495
2022-12-08 02:50:29 +00:00
孙广明 5a7fdb8ec5 Merge branch 'master_xieqiyu_78699' into 'master'
* Finish task#78699.

See merge request easycorp/zentaopms!6496
2022-12-08 02:50:18 +00:00
孙广明 132f585eb2 Merge branch 'master_xieqiyu_78698' into 'master'
* Finish task#78698.

See merge request easycorp/zentaopms!6497
2022-12-08 02:50:08 +00:00
孙广明 c9fda51093 Merge branch 'master_xieqiyu_78661' into 'master'
Master xieqiyu 78661

See merge request easycorp/zentaopms!6493
2022-12-08 02:49:59 +00:00
xieqiyu 847bb6be13 * Finish task#78698. 2022-12-08 10:46:58 +08:00
xieqiyu 8472e0a191 * Finish task#78699. 2022-12-08 10:34:46 +08:00
xieqiyu 80af5ddba5 * Finish task#78690. 2022-12-08 10:06:46 +08:00
wangyidong e4b9ef4536 * fix bug #30585. 2022-12-08 09:56:31 +08:00
xieqiyu 44c075b0ae * Fix bug#30613. 2022-12-08 09:50:30 +08:00
wangyidong 3e18aa302a * fix bug #30584. 2022-12-08 09:16:17 +08:00
王怡栋 e259eaea2b Merge branch 'bug_30581' into 'master'
* Fix bug#30581

See merge request easycorp/zentaopms!6487
2022-12-08 00:30:37 +00:00
xieqiyu ec6f263bd3 * Code for task#78661. 2022-12-07 21:42:59 +08:00
wangyidong 771dd4c8ed * code for task #78908,78918. 2022-12-07 17:42:41 +08:00
孙广明 bfab34538b Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Finish Task #78697 Bug #30616#30558

See merge request easycorp/zentaopms!6492
2022-12-07 08:01:02 +00:00
lanzongjun 7189103e60 * Finish Bug #30558 2022-12-07 15:58:31 +08:00
lanzongjun 04cb6a9cac * Finish Bug #30616 2022-12-07 15:53:10 +08:00
Yagami d2044980df * Code for release's branch. 2022-12-07 15:29:15 +08:00
lanzongjun 87e1db0555 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun 2022-12-07 15:21:23 +08:00
lanzongjun 29d8ff292a * Finish Task #78697 2022-12-07 15:17:35 +08:00
孙广明 50bb73fe57 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Finish Task #78673#78688

See merge request easycorp/zentaopms!6489
2022-12-07 07:01:14 +00:00
孙广明 5ae031e0c6 Merge branch 'zhouxin_feedback_1659' into 'master'
* Fix filter of base64.

See merge request easycorp/zentaopms!6491
2022-12-07 07:00:29 +00:00
zhouxin f41dc323bf * Fix filter of base64. 2022-12-07 06:58:26 +00:00
Yagami cea279faf1 * Code for task #78672. 2022-12-07 14:49:29 +08:00
Yagami 57dbeba6d9 * Finish task #78672. 2022-12-07 14:45:14 +08:00
lanzongjun 5f3444278b * Finish Task #78688 2022-12-07 14:22:27 +08:00
xieqiyu ae62bdff75 * Code for task#78661. 2022-12-07 14:19:36 +08:00
孙广明 688866a30e Merge branch 'master_xieqiyu_78668' into 'master'
* Finish task#78668.

See merge request easycorp/zentaopms!6488
2022-12-07 05:01:49 +00:00
wangyidong 6ce9128370 * fix bug #30589. 2022-12-07 11:50:17 +08:00
xieqiyu a2d2c55e94 * Code for task#78668. Add trim. 2022-12-07 11:25:41 +08:00
lanzongjun 125610f6c5 * Finish Task #78673 2022-12-07 11:23:57 +08:00
wangyidong 8a2cb317c5 * adjust for release story build. 2022-12-07 11:17:00 +08:00
xieqiyu afe9d49024 * Finish task#78668. 2022-12-07 11:16:55 +08:00
wangyidong 1119afb709 * code for task #78910. 2022-12-07 10:58:26 +08:00
zenggang 88b7894a3f * Fix bug#30581 2022-12-07 02:44:14 +00:00
Wenrui LI a6258b2d78 * add todo for tasks search api. 2022-12-07 10:40:01 +08:00
lanzongjun a0c48aa7c0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun 2022-12-07 10:38:55 +08:00
Wenrui LI 8aa30bd281 * use tasks api in zentao bot. 2022-12-07 10:36:49 +08:00
wangyidong 595ec286b6 * adjust for show build path. 2022-12-07 10:34:10 +08:00
王怡栋 6e5594f6cf Merge branch 'sprint/wangzemei/annualdata' into 'master'
* Optimize the display of radar charts

See merge request easycorp/zentaopms!6486
2022-12-07 01:55:49 +00:00
lanzongjun 15d16d3eb6 add default branchName 2022-12-07 09:50:09 +08:00
wangzemei a11b1deeb9 * Optimize the display of radar charts 2022-12-07 09:48:12 +08:00
Wenrui LI 6491d70c06 * move task get list by search into task model, and add to api. 2022-12-07 09:43:50 +08:00
孙广明 cbb280ba3f Merge branch 'master_xieqiyu_fixbug' into 'master'
* Code for task#78669. Fix bug of edit parent plan.

See merge request easycorp/zentaopms!6480
2022-12-07 01:36:23 +00:00
Yagami 1b26176882 * Modify sql. 2022-12-07 09:36:05 +08:00