Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
40,844 Commits 2 Branches 292 Tags
0400a2628afcd2d7833babbcaabf80d74d76dce2
Commit Graph
683 Commits
Author SHA1 Message Date
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
mayue 8730491de8 * Fix bug#17864. 2022-04-12 10:54:21 +08:00
孙广明 2b02f4dd38 Merge branch 'fixbug_sunjun_21618' into 'master' 
Fixbug sunjun 21618

See merge request easycorp/zentaopms!2859
 2022-04-12 01:40:59 +00:00
sunjun c36f432e1a *Fixbug_sunjun_21618 2022-04-12 08:35:31 +08:00
xieqiyu c7894fdb78 * Fix bug#15697. 2022-04-11 16:07:45 +08:00
sunjun 75a70acec3 *Fixbug_sunjun_21618 2022-04-11 14:50:59 +08:00
mayue a9c203b866 * Fix bug #21616. 2022-04-11 08:38:13 +08:00
zhouxin 56f05dd70c * Fix bug #16635. 2022-04-08 05:27:16 +00:00
caoyanyi ae8728b5da * Fix bug #20309. 2022-04-06 15:46:25 +08:00
李玉春 8a687ef1d5 Merge branch 'sunhuawei_fixbug_20335' into 'master' 
Sunhuawei fixbug 20335

See merge request easycorp/zentaopms!2702
 2022-04-02 09:10:04 +00:00
孙华伟 1612f6aabd Optimize the code. 2022-04-02 17:08:34 +08:00
孙华伟 c6327139bc Optimize the code. 2022-04-02 01:32:33 +00:00
孙华伟 a58fc45e20 Optimize the code. 2022-04-02 08:47:38 +08:00
孙华伟 41d22a7f4b *Fix bug#20335 2022-04-01 11:01:57 +08:00
孙华伟 c7ad6e6e4d Update control.php 2022-04-01 02:19:51 +00:00
孙华伟 bde366867c *Fix bug#21235 2022-03-31 10:14:40 +08:00
liyuchun 166cda1186 * Fix bug #17235. 2022-03-22 14:12:44 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
zhouxudong 995c88a678 * Fix bug #20112. 2022-03-18 11:57:22 +08:00
李玉春 92045688e8 Merge branch 'pailei2_sunhuawei_11010' into 'pailei2' 
*Fix bug #11010.

See merge request easycorp/zentaopms!2334
 2022-03-17 08:38:22 +00:00
孙华伟 ae1bc57c73 optimized code. 2022-03-17 16:11:53 +08:00