Commit Graph
507 Commits
Author SHA1 Message Date
leiyong accd4feee5 * Adjust Modified Fields. 2022-07-13 02:57:28 +00:00
王怡栋 0ac2e857a4 Merge branch 'sprint214_leiyong_task_60384' into 'master'
Sprint214 leiyong task 60384

See merge request easycorp/zentaopms!4495
2022-07-13 02:25:36 +00:00
liumengyi fab6829823 * Fix bug for task #60395. 2022-07-13 08:36:47 +08:00
leiyong 9ea1185649 * Finish task#60378. 2022-07-12 09:10:05 +00:00
liumengyi b8642a3350 * Finish task #60395. 2022-07-11 14:49:36 +08:00
liumengyi 59bbb4577a * Finish task #59482. 2022-07-07 09:44:33 +08:00
liumengyi 73fe07dd49 * Finish task #59482. 2022-07-06 16:18:44 +08:00
王怡栋 c7b10921f4 Merge branch 'sprint/211_liumengyi_59477' into 'master'
* Finish task #59477.

See merge request easycorp/zentaopms!4364
2022-07-06 01:50:59 +00:00
liumengyi 45183de128 * Add annotation. 2022-07-06 09:49:20 +08:00
liumengyi 7bb148a48b * Fix bug of task #59477. 2022-07-05 22:17:19 +08:00
liumengyi c82f3f1886 * Finish task #59477. 2022-07-05 14:36:16 +08:00
liumengyi 57c87e5912 * Finish task #59477. 2022-07-05 13:52:57 +08:00
王怡栋 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
liumengyi d1f25755f1 * Finish task #59477. 2022-07-05 09:39:55 +08: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
sunjun 183b1a716b fixbug_23768 2022-06-30 09:26:19 +00:00
sunjun 815e95eb6c fixbug_24544 2022-06-29 08:30:13 +00:00
liumengyi a6d87c2539 * Fix bug #24500. 2022-06-29 08:13:59 +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
xieqiyu d4ac1b4a5f * Code for task#57850. 2022-06-23 17:20:19 +08:00
hufangzhou adad8ea3ae * Finish task #57882, #57874, #57873, #57855. 2022-06-21 17:30:36 +08:00
孙广明 e31b570be2 * Fix bug #23680. 2022-06-14 16:18:34 +08:00
孙广明 089662bd5e * Finish task #56629. 2022-06-14 10:20:29 +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
tianshujie 10b763fdf2 * Fix bug #23230. 2022-06-02 16:35:48 +08:00
wangyuting2 065f5e738a * Finish task #55566. 2022-06-02 11:00:17 +08:00
liyuchun 29ceb63023 * Fix bug #23132. 2022-06-02 02:49:27 +00:00
wangyidong 2400dfc83a * code for task #55568. 2022-06-01 14:48:35 +08:00
wangyidong 6f5689de1a * adjust for create testcase-edit link in different tab. 2022-05-31 16:16:50 +08:00
xieqiyu 063fba9ddf * Code for task#54463. Modify review code. 2022-05-20 14:03:05 +08:00
xieqiyu 1c06ae03f1 * Code for task#54463. 2022-05-20 13:18:57 +08:00
xieqiyu c07f0dbdab * Finish task#54463. 2022-05-20 12:37:26 +08:00
liumengyi 5bdc188491 * Code format for bug #22585. 2022-05-18 10:12:42 +08:00
liumengyi b4a34e2ed6 * Fix bug #22585. 2022-05-18 10:10:06 +08:00
liumengyi bff314e0d4 * Modify code for task #54354. 2022-05-17 17:26:17 +08:00
wangyuting2 d4ed89e64a * Finish task #53548. 2022-05-11 15:05:13 +08:00
王怡栋 d9d331c38e Merge branch 'master' into 'sprint/wangyuting_workflow'
# Conflicts:
#   framework/control.class.php
2022-05-10 08:46:32 +00:00
wangyuting2 fe3c882c5e * Adjust buildin workflow menu. 2022-05-10 16:32:04 +08:00
daitingting d577d57a33 * Add id for checking unique field. 2022-05-09 17:02:23 +08:00
daitingting e30acad1f2 * Add id for checking unique field. 2022-05-09 07:56:17 +00:00
daitingting 96e460c47d * Finish task #53549. 2022-05-09 06:41:35 +00:00
李玉春 06a38f17e3 Merge branch 'sprint/renying_Fixbug#21999' into 'master'
Sprint/renying fixbug#21999

See merge request easycorp/zentaopms!3215
2022-04-29 05:34:30 +00:00