Commit Graph

703 Commits

Author SHA1 Message Date
tianshujie
b8124e12f4 * Fix bug #25435. 2022-07-21 11:27:55 +08:00
tianshujie
e122aa3be7 * Fix bug #25435. 2022-07-21 11:11:21 +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
625d04ff6f * Fix bug of task #59477. 2022-07-06 09:51:14 +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
liumengyi
d1f25755f1 * Finish task #59477. 2022-07-05 09:39:55 +08:00
liumengyi
79e71873c5 * Finish task #59477. 2022-07-04 15:50:03 +08: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
liumengyi
30e6558572 * Fix bug #24487. 2022-06-29 14:07:47 +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
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
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
孙广明
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
孙广明
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
xieqiyu
c1bc3c7d41 * Fix bug of select main branch. 2022-06-01 20:44:31 +08:00
xieqiyu
5f5f721d19 * Finish task#55631. 2022-06-01 00:26:43 +08:00
tianshujie
a9021ec5a3 * Fix bug #23010. 2022-05-27 14:15:59 +08:00
tianshujie
93943c76dc * Finish issue #649. 2022-05-27 13:26:12 +08:00
liumengyi
5df98760ae * Fix bug #22995. 2022-05-26 16:38:06 +08:00
leiyong
6c1d71c837 * Finish task#54980. 2022-05-26 03:24:37 +00:00
李玉春
03469dbd1e Merge branch 'sprint/194_tianshujie_14741' into 'master'
Sprint/194 tianshujie 14741

See merge request easycorp/zentaopms!3557
2022-05-24 05:39:25 +00:00
tianshujie
63b5d64dc8 * Finish task #14741. 2022-05-24 13:38:11 +08:00
tianshujie
e9bf958a3c * Finish task #55253. 2022-05-24 13:28:16 +08:00
tanghucheng
d3dc4ebe43 * Fix bug. 2022-05-17 06:00:26 +00:00
xieqiyu
88fbdad2fd * Fix bug#22114. 2022-04-29 11:29:40 +08:00
tianshujie
ec0faba808 * Fix bug #18060. 2022-04-21 15:59:45 +08:00
tianshujie
edbc8e5d0b * Fix bug #18060. 2022-04-21 15:52:57 +08:00
zhouxin
6097b53514 * Fix bug. 2022-04-18 08:35:55 +00:00
zhouxin
b04e4d2236 * Fix bug #21801. 2022-04-15 07:36:19 +00:00
tianshujie
5fa9f0d1a9 * Fix bug #21717. 2022-04-14 15:48:09 +08:00
王怡栋
403ad59a5f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-12 15:03:48 +08:00
王怡栋
538f831692 Merge branch 'master' into 'sprint/tianshujie_bug16527'
# Conflicts:
#   module/testcase/control.php
#   module/testcase/view/batchedit.html.php
2022-04-12 06:57:23 +00:00
tianshujie
a8b051c12b * Fix bug #16527. 2022-04-12 12:58:56 +08:00