Commit Graph
2077 Commits
Author SHA1 Message Date
王怡栋 71ab49c34e Merge branch 'sprint/master_zhouxudong_59529' into 'master'
* Finish task #59534 #59530 #59529.

See merge request easycorp/zentaopms!4325
2022-07-05 02:09:08 +00:00
zhouxudong 0b309f63bd * Finish task #59534 #59530 #59529. 2022-07-04 08:54:44 +00:00
zhouxudong 1c00265c79 * Finish task #59527 #59572. 2022-07-04 07:21:39 +00:00
孙广明 cb767b9334 Merge branch 'fixbug_23768' into 'master'
Fixbug 23768

See merge request easycorp/zentaopms!4292
2022-07-01 00:54:35 +00:00
sunjun 04d64fa539 fixbug_23768 2022-07-01 00:27:49 +00:00
sunjun 183b1a716b fixbug_23768 2022-06-30 09:26:19 +00:00
liumengyi d65ba3736d * Fix bug #24609. 2022-06-30 16:44:36 +08:00
王怡栋 3f2ff5ad45 Merge branch 'fixbug_24544' into 'master'
fixbug_24544

See merge request easycorp/zentaopms!4229
2022-06-29 09:19:17 +00:00
sunjun dda32cc5ff fixbug_24544 2022-06-29 09:16:29 +00:00
sunjun fcda045040 fixbug_24544 2022-06-29 08:55:08 +00:00
孙广明 667c44c591 Merge branch 'fixbug_24544' into 'master'
fixbug_24544

See merge request easycorp/zentaopms!4227
2022-06-29 08:32:02 +00:00
sunjun 815e95eb6c fixbug_24544 2022-06-29 08:30:13 +00:00
tianshujie 49a1cfa087 * Fix bug #24529. 2022-06-29 16:24:29 +08:00
liumengyi 30e6558572 * Fix bug #24487. 2022-06-29 14:07:47 +08:00
liumengyi a6d87c2539 * Fix bug #24500. 2022-06-29 08:13:59 +08:00
liumengyi c61cc238c0 * Fix bug #24475. 2022-06-28 16:16:51 +08:00
liumengyi 38ff5fd283 * Fix bug #24464. 2022-06-28 15:20:31 +08:00
liumengyi cd3956ad1c * Optimize code. 2022-06-28 13:06:38 +08:00
liumengyi ca6332efaa * Optimize code. 2022-06-28 13:04:44 +08:00
liumengyi d08f95c0fa * Optimize code. 2022-06-28 12:24:21 +08:00
liumengyi 16d62b8a6e * Finish task #58562. 2022-06-28 10:48:25 +08:00
liumengyi cca9efbb77 * Finish task #58561. 2022-06-28 10:33:05 +08:00
孙广明 f8f88249a4 Merge branch 'sprint/207_mayue_bug#24059' into 'master'
* Fix bug #24059.

See merge request easycorp/zentaopms!4112
2022-06-23 09:36:33 +00:00
mayue 1c64648461 * Optimize code. 2022-06-23 17:29:26 +08:00
xieqiyu d4ac1b4a5f * Code for task#57850. 2022-06-23 17:20:19 +08:00
mayue 52ff077e79 * Fix bug #24059. 2022-06-23 15:29:59 +08:00
王怡栋 c69384617a Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.

See merge request easycorp/zentaopms!4083
2022-06-23 00:39:25 +00:00
xieqiyu 21b0217aa8 * Code for task#57850. 2022-06-22 13:15:44 +08:00
hufangzhou 49b9f3dffb * Fix bug for the character width. 2022-06-22 09:32:07 +08:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
hufangzhou adad8ea3ae * Finish task #57882, #57874, #57873, #57855. 2022-06-21 17:30:36 +08:00
孙广明 bfa7047dff Merge branch 'sgm_fixbug' into 'master'
Sgm fixbug

See merge request easycorp/zentaopms!3970
2022-06-16 05:17:36 +00:00
孙广明 ef6f5e0eec * Code for testcase view page display bug style. 2022-06-16 13:15:57 +08:00
xieqiyu 16f8efac4e * Fix bug#23724. 2022-06-15 18:38:01 +08:00
李玉春 4740125462 Merge branch 'sprint/203_mayue_bug23184' into 'master'
* Fix bug #23184.

See merge request easycorp/zentaopms!3913
2022-06-14 08:50:25 +00:00
mayue 51f3db8f40 * Optimize code. 2022-06-14 16:32:57 +08:00
孙广明 e31b570be2 * Fix bug #23680. 2022-06-14 16:18:34 +08:00
mayue 92c7801528 * Fix bug #23184. 2022-06-14 15:44:54 +08:00
xieqiyu 254dbf58e5 * Finish task#56935. 2022-06-14 13:10:19 +08:00
孙广明 e287ded97e * Add en lang. 2022-06-14 10:25:33 +08:00
孙广明 089662bd5e * Finish task #56629. 2022-06-14 10:20:29 +08:00
wangyidong 9b699300ff * code for bug #23516. 2022-06-09 16:50:07 +08:00
孙广明 07591cfd0f Merge branch 'sprint_201_56459' into 'master'
Sprint 201 56459

See merge request easycorp/zentaopms!3802
2022-06-09 00:35:28 +00:00
wangyidong 11e6edcd22 Merge branch 'zdoo18' 2022-06-08 17:06:07 +08:00
sunjun 305c6ee543 sprint_201_56459 2022-06-08 08:59:25 +00:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
mayue d5bc70122f * Fix bug #23320. 2022-06-06 16:33:00 +08:00
xieqiyu 0bfb4cea16 * Fix bug#23156. 2022-06-06 00:45:22 +08:00
tianshujie 10b763fdf2 * Fix bug #23230. 2022-06-02 16:35:48 +08:00