Commit Graph
39255 Commits
Author SHA1 Message Date
leiyong df87ffddd2 * Finish task#54472. 2022-05-20 03:40:45 +00:00
孙广明 4e8ae522e4 Merge branch 'sprint/192_leiyong_task_54489' into 'master'
* Finish task#54489.

See merge request easycorp/zentaopms!3538
2022-05-20 02:01:37 +00:00
leiyong b209e48e67 * Finish task#54489. 2022-05-20 01:43:32 +00:00
孙广明 233071018d Merge branch 'mayue_add_autotest' into 'master'
* Add productplan autotest.

See merge request easycorp/zentaopms!3537
2022-05-20 01:43:17 +00:00
mayue 2622d23c31 * Optimize code. 2022-05-20 01:42:16 +00:00
孙广明 97f5dcdc9f Merge branch 'sprint190_zg_bugs' into 'master'
* Fix bug#22554,22673,22555

See merge request easycorp/zentaopms!3508
2022-05-20 01:41:31 +00:00
孙广明 747a7af788 Merge branch 'sprint190_zg_54192' into 'master'
* Add project name

See merge request easycorp/zentaopms!3516
2022-05-20 01:40:18 +00:00
mayue 7f29610e0f * Add productplan autotest. 2022-05-20 01:39:21 +00:00
孙广明 74c766d89c Merge branch 'sprint/191_liumengyi_unittest' into 'master'
* Add unit test of sprint 191.

See merge request easycorp/zentaopms!3534
2022-05-20 01:37:49 +00:00
李玉春 2dc44d9fe6 Merge branch 'sprint/191_tianshujie_fixbug' into 'master'
Sprint/191 tianshujie fixbug

See merge request easycorp/zentaopms!3535
2022-05-20 01:35:06 +00:00
liyuchun 9d05eee2a0 * Fix bug #22666. 2022-05-20 01:18:12 +00:00
李玉春 125a240f4b Merge branch 'cyy_22698' into 'master'
* Fix bug #22698.

See merge request easycorp/zentaopms!3536
2022-05-20 01:07:46 +00:00
caoyanyi 53b52b7101 * Fix bug #22698. 2022-05-20 09:04:53 +08:00
tianshujie 1e65c36b18 * Modify the kanban module test case. 2022-05-20 09:00:48 +08:00
liumengyi 38c9cae3ae * Add unit test of sprint 191. 2022-05-20 08:59:20 +08:00
王怡栋 5fdd197e2c Merge branch 'sprint/master_zhouxudong_54471' into 'master'
Sprint/master zhouxudong 54471

See merge request easycorp/zentaopms!3513
2022-05-20 00:58:42 +00:00
王怡栋 857d4ce63a Merge branch 'sprint/master_zhouxudong_54478' into 'master'
* Finish task #54478.

See merge request easycorp/zentaopms!3533
2022-05-20 00:57:51 +00:00
李玉春 6c870f57c9 Merge branch 'sprint/192_leiyong_bug_22713' into 'master'
* Fix bug#22713.

See merge request easycorp/zentaopms!3532
2022-05-20 00:52:57 +00:00
tianshujie 3742cf99d0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/191_tianshujie_fixbug 2022-05-20 08:40:49 +08:00
leiyong 77a180d4ad * Fix bug#22713. 2022-05-20 00:37:44 +00:00
李玉春 0fa2c55ece Merge branch 'sprint/192_leiyong_task_54488' into 'master'
* Finish task#54488.

See merge request easycorp/zentaopms!3531
2022-05-20 00:29:05 +00:00
tianshujie 3b98d078af * Fix bug #22595. 2022-05-20 08:17:06 +08:00
孙广明 3af60483f3 Merge branch 'sprint/191_tianshujie_issue' into 'master'
Sprint/191 tianshujie issue

See merge request easycorp/zentaopms!3526
2022-05-19 10:03:24 +00:00
孙广明 9e08e6ecbd Merge branch 'sprint/191_tianshujie_case' into 'master'
* Add testcase of user module.

See merge request easycorp/zentaopms!3519
2022-05-19 10:02:32 +00:00
tianshujie f652d15c2f * Fix bug #22693. 2022-05-19 17:39:04 +08:00
王怡栋 c1b5936225 Merge branch 'master_xieqiyu_54467' into 'master'
* Code for task#54467.

See merge request easycorp/zentaopms!3525
2022-05-19 09:36:58 +00:00
leiyong 143e9aff96 * Finish task#54488. 2022-05-19 09:32:47 +00:00
zhouxudong 86cb028806 * Finish task #54471. 2022-05-19 09:14:25 +00:00
李玉春 7382fc1476 Merge branch 'sprint/191_liumengyi_fixbug' into 'master'
* Fix bug for kanban closed and bug batch assign.

See merge request easycorp/zentaopms!3527
2022-05-19 08:55:16 +00:00
zhouxudong ab9f80ecfb * Finish task #54478. 2022-05-19 08:52:19 +00:00
liumengyi b70e6047db * Fix bug for batch assign. 2022-05-19 16:33:20 +08:00
liumengyi 3593269492 * Fix bug for kanban closed. 2022-05-19 16:30:20 +08:00
tianshujie 2f751595cc * Resoled issue #640. 2022-05-19 16:25:58 +08:00
tianshujie 765cf7438e * When mandatory review, add required items to the review. 2022-05-19 16:25:06 +08:00
xieqiyu 087b3ac65f * Code for task#54467. 2022-05-19 16:20:35 +08:00
zenggang de835ecb3e * Fix bug#22555 2022-05-19 08:08:39 +00:00
李玉春 0885cef63b Merge branch 'cyy_22688' into 'master'
* Fix bug #22688.

See merge request easycorp/zentaopms!3523
2022-05-19 07:54:19 +00:00
李玉春 bf230553ab Merge branch 'sprint/190_mayue_bug#22639' into 'master'
* Fix bug #22639.

See merge request easycorp/zentaopms!3509
2022-05-19 07:53:26 +00:00
李玉春 088bea319e Merge branch 'sprint/192_leiyong_task_54469' into 'master'
Sprint/192 leiyong task 54469

See merge request easycorp/zentaopms!3517
2022-05-19 07:53:10 +00:00
zhouxudong 7ef420688e * Finish task #54471. 2022-05-19 07:53:07 +00:00
mayue 08588cc445 * Optimize code. 2022-05-19 07:52:24 +00:00
李玉春 b2909b2b54 Merge branch 'sprint_sunjun_fixbug' into 'master'
sprint_sunjun_fixbug

See merge request easycorp/zentaopms!3518
2022-05-19 07:49:04 +00:00
caoyanyi 7bfe6d767e * Fix bug #22688. 2022-05-19 15:48:35 +08:00
mayue 8e415b38cb * Fix bug #22639. 2022-05-19 07:45:02 +00:00
leiyong 4c14307de1 * Adjust CSS. 2022-05-19 07:44:47 +00:00
孙广明 57a7f0bcef Merge branch 'sprint/sunhao/optimize_kanban' into 'master'
* task #54187, optimize kanban with a lot of cards with virtualList.

See merge request easycorp/zentaopms!3511
2022-05-19 07:43:19 +00:00
Hao Sun 4bcdcce53a * task #54187, optimize perf for page execution/kanban and kanban/view 2022-05-19 07:41:17 +00:00
mayue 66c6bf6bc5 * Fix bug #22639.* Fix bug #22639.* Fix bug #22639.* Fix bug #22639.* Fix bug #22639.* Fix bug #22639.* Fix bug #22639.* Fix bug #22639. 2022-05-19 07:39:46 +00:00
李玉春 696c0ea711 Merge branch 'sunhuawei_fixbug_22375' into 'master'
*Fix bug #22375.

See merge request easycorp/zentaopms!3520
2022-05-19 07:32:07 +00:00
孙华伟 9e9395694d *Fix bug #22375. 2022-05-19 15:27:37 +08:00