Commit Graph
3360 Commits
Author SHA1 Message Date
王怡栋 4f6e7cbe34 Merge branch 'tsj_fixbug' into 'master'
Tsj fixbug

See merge request easycorp/zentaopms!7096
2023-03-01 00:32:32 +00:00
王怡栋 97feb59658 Merge branch 'master_xieqiyu_28400' into 'master'
* Code for bug#28400.

See merge request easycorp/zentaopms!7090
2023-03-01 00:30:04 +00:00
孙广明 c9a7c22553 Merge branch 'sprint/294_liumengyi_fixbug' into 'master'
* Fix bug 32493 32502 32495 32494 32491.

See merge request easycorp/zentaopms!7092
2023-02-28 09:12:43 +00:00
caoyanyi 0eb7b70d48 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-28 17:07:32 +08:00
tianshujie 0f7d855f3e * Code for fix bug #32511. 2023-02-28 17:05:37 +08:00
tianshujie 797c0befa2 * Code for fix bug #32505. 2023-02-28 17:03:09 +08:00
Yagami 7ca8fbffb4 * Fix code error. 2023-02-28 16:22:59 +08:00
liumengyi adba207640 * Fix bug #32502. 2023-02-28 08:07:03 +00:00
liumengyi 1c5578745b * Fix bug #32493. 2023-02-28 07:56:21 +00:00
孙广明 54c3641625 Merge branch 'fixbug_liumengyi' into 'master'
* Optimize code, fix bug 32456 32457 32463 32464 32477 32480.

See merge request easycorp/zentaopms!7086
2023-02-28 07:15:20 +00:00
xieqiyu 23518e36fd * Code for bug#32489. 2023-02-28 14:33:43 +08:00
Yagami abc8bf2788 * Fix bug #32450. 2023-02-28 14:16:29 +08:00
caoyanyi ac2891ac41 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-28 13:53:09 +08:00
liumengyi cbed975b74 * Fix bug #32477, and fix bug of change parent stage. 2023-02-28 05:44:39 +00:00
liumengyi d480741a01 * Fix bug of computeProgress. 2023-02-28 05:17:52 +00:00
liumengyi 0f7851c03a * Fix bug #32464. 2023-02-28 02:59:43 +00:00
liumengyi ffe4cdafb2 * Fix bug #32463. 2023-02-28 02:51:14 +00:00
liumengyi 7438d3665b * Fix bug #32457. 2023-02-28 02:28:07 +00:00
zhujinyong 07f2c4520e * Fix bug: hide bug in tree view. 2023-02-28 10:18:51 +08:00
zhujinyong 60198497ba * Fix bug: hidden story or bug in kanban or sprint. 2023-02-28 10:10:37 +08:00
liumengyi 33903ea9cb * Fix bug #32456. 2023-02-28 01:55:52 +00:00
liumengyi 415c19a5d4 * Optimize code. 2023-02-28 01:47:28 +00:00
tianshujie 5fe4075ef1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-28 08:26:03 +08:00
liumengyi 1d0e0aa68c * Fix bug #32445. 2023-02-27 08:38:16 +00:00
liumengyi 226f798470 * Finish task #85631. 2023-02-27 08:08:07 +00:00
tianshujie cf4c9931e2 * Code for finish task #84527. 2023-02-27 15:29:02 +08:00
caoyanyi a576a06b3f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-27 09:05:16 +08:00
孙广明 aba0de11ac Merge branch 'sprint/hufangzhou_executionUnit' into 'master'
* Add execution module unit testcase.

See merge request easycorp/zentaopms!7067
2023-02-27 00:34:11 +00:00
Yagami a7db149f73 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-02-24 16:32:12 +08:00
Yagami 9eaf0920e8 * Remove unused code. 2023-02-24 16:31:32 +08:00
hufangzhou 340ae715e6 * Add execution module unit testcase. 2023-02-24 08:27:55 +00:00
孙广明 2fdd4f704a Merge branch 'sprint/lmy_task' into 'master'
* Finish task #85455, #85456.

See merge request easycorp/zentaopms!7066
2023-02-24 07:20:22 +00:00
Yagami b151d1fb32 * Finish task #85459. 2023-02-24 14:50:37 +08:00
liumengyi f45c4ccdd4 * Finish task #85455, #85456. 2023-02-24 06:24:16 +00:00
guofeilong c62dbb7792 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-24 13:47:19 +08:00
tianshujie 70f07dde4a * Remove other navigation for iterations under the Fusion Falls project. 2023-02-24 11:32:51 +08:00
孙广明 fccd283453 Merge branch 'sprint/292_liumengyi_32202' into 'master'
* Fix bug #32202,#32281, and finish task #42089.

See merge request easycorp/zentaopms!7051
2023-02-24 03:22:19 +00:00
孙广明 986e4d1e36 Merge branch 'sprint/292_liumengyi_85434' into 'master'
* Finish task #85434.

See merge request easycorp/zentaopms!7052
2023-02-24 03:22:13 +00:00
孙广明 e624b8c1e2 Merge branch 'sprint/292_liumengyi_fixbug' into 'master'
* Add sql for process, and modify method to management method, fix bug #32421,#32424.

See merge request easycorp/zentaopms!7061
2023-02-24 03:21:47 +00:00
zhujinyong 94831920f5 * Fix bug: duplicate definition. 2023-02-24 10:56:52 +08:00
liumengyi ae5ad1bba8 * Fix bug #32421. 2023-02-24 02:31:15 +00:00
zhujinyong d0ab2da0d1 * Fix bug #32403. 2023-02-24 10:25:57 +08:00
liumengyi f2d6a76c93 * Modify method to management method. 2023-02-24 02:07:22 +00:00
caoyanyi a65210515c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-24 09:14:45 +08:00
王怡栋 9e73c11871 Merge branch 'zentaopms_wangyuting' into 'master'
* Fix bug #27133.

See merge request easycorp/zentaopms!7060
2023-02-24 00:52:49 +00:00
wangyuting2 7de68720de * Fix bug #27133. 2023-02-24 08:47:54 +08:00
caoyanyi 2f3aae9281 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-23 16:05:42 +08:00
tianshujie a5d903b856 * Fix bug #32208. 2023-02-23 16:04:12 +08:00
liumengyi d52c3bd4d3 * Fix bug #32281. 2023-02-23 07:30:39 +00:00
tianshujie b350a3aff4 * Fix bug #32412. 2023-02-23 14:52:18 +08:00