Commit Graph
609 Commits
Author SHA1 Message Date
wangyidong ebe6dd630f * fix bug #25921. 2022-08-03 10:35:41 +08:00
hufangzhou 8883ac8e77 * Finish task #62132, #62133, #62134, #62135, #62136. 2022-07-26 18:14:09 +08:00
wangyidong adedb487b5 * fix bug #24242. 2022-06-29 10:46:50 +08:00
liumengyi 3cbc219ad5 * Code review. 2022-06-24 14:18:31 +08:00
liumengyi 48532553f2 * Fix bug #24246. 2022-06-24 09:05:46 +08:00
xieqiyu d4ac1b4a5f * Code for task#57850. 2022-06-23 17:20:19 +08:00
liumengyi 0400a2628a * Fix issue 682. 2022-06-23 13:09:10 +08:00
liumengyi a57ab674d9 * Fix bug. 2022-06-23 09:52:10 +08:00
liumengyi 67f88f0177 * Fix bug. 2022-06-23 09:50:44 +08:00
sunjun 14de888e17 fixbug_search 2022-06-23 01:17:33 +00:00
王怡栋 9d264f0514 Merge branch 'master_xieqiyu_57851' into 'master'
* Finish task#57851.

See merge request easycorp/zentaopms!4072
2022-06-22 09:22:22 +00:00
sunjun ddd5818fc1 fixbug_doc 2022-06-22 09:10:27 +00:00
xieqiyu 91ae053816 * Code for task#57851. 2022-06-22 16:41:36 +08:00
xieqiyu 1bc779acd9 * Finish task#57851. 2022-06-22 16:20:14 +08:00
孙广明 1b562972e8 Merge branch 'sprint/206' into 'sprint_206_57892'
# Conflicts:
#   module/doc/model.php
2022-06-22 03:10:18 +00:00
liumengyi 5ce8133079 * Fix bug for task #57891 #57890 #57889 #57886 #57885 #57892 #57887. 2022-06-22 10:58:57 +08:00
liumengyi 8c229fa6bc * Finish task #58063. 2022-06-22 08:59:29 +08:00
sunjun eafcb352c6 * Finish task #57891 #57890 #57889 #57886 #57885 #57892 #57887 2022-06-21 05:17:09 +00:00
zhouxin a6c7038d6c * Code for review. 2022-06-17 03:19:45 +00:00
mayue 179191fd7d * Fix bug #23183. 2022-06-16 16:15:13 +08:00
zhouxin 555ca3c450 * Adjust code. 2022-06-10 02:50:27 +00:00
zhouxin d1e3ba6c5e * Adjust code. 2022-06-10 02:46:45 +00:00
zhouxin b167243b48 * Finish task #56467. 2022-06-10 02:31:24 +00:00
zhouxin b10daf5a01 * Adjust code. 2022-06-10 01:40:16 +00:00
zhouxin ee8af517fa * Finish task #56467. 2022-06-10 01:22:12 +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
hufangzhou 02e6680d05 * Fix bug #22992. 2022-05-27 13:25:44 +08:00
tianshujie eb7b7d92c4 * Fix bug #22483. 2022-05-13 14:17:13 +08:00
tianshujie 10e48b66d9 * Fix bug #22378. 2022-05-12 15:50:05 +08:00
tianshujie 2bdfa7449d * Finish task #53831. 2022-05-11 14:44:16 +08:00
tianshujie e316483175 * Finish task #53831. 2022-05-11 14:13:30 +08:00
tianshujie b715ecd177 * Finish task #53655. 2022-05-11 11:13:41 +08:00
孙广明 305a4074e4 * Rename var. 2022-05-07 13:50:02 +08:00
mayue 0552260277 * Fix bug #22148. 2022-05-05 05:43:52 +00:00
王怡栋 35c6389735 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #22019

See merge request easycorp/zentaopms!3195
2022-04-28 08:51:30 +00:00
lanzongjun 3bdab60664 * fix bug #22019 2022-04-28 15:48:24 +08:00
wangyidong 4e24558f9f * code for bug #15815. 2022-04-28 11:54:46 +08:00
wangyidong fbd33f5262 * code bug #15815. 2022-04-28 11:54:46 +08:00
hufangzhou bad39397ce * Fix bug #15582. 2022-04-28 10:56:13 +08:00
朱金勇 90a29b0743 Merge branch 'sprint/fixbug_hufangzhou_15599' into 'master'
* Fix bug #15599.

See merge request easycorp/zentaopms!3164
2022-04-27 08:20:44 +00:00
hufangzhou 8907f7c898 * Fix bug #15599. 2022-04-27 15:53:18 +08:00
hufangzhou 1235dd8101 * Fix bug #22039. 2022-04-27 15:24:30 +08:00
Zongjun Lan 7e63a02e20 * fix bug #18934 2022-04-21 16:09:34 +08:00
王怡栋 667439ab4c Merge branch 'sprint/fixbug_hufangzhou_21829' into 'master'
* Fix bug #21829.

See merge request easycorp/zentaopms!2995
2022-04-19 00:43:36 +00:00
hufangzhou bc381ede7d * Fix bug #21833. 2022-04-18 16:45:12 +08:00
hufangzhou bdc7323b19 * Fix bug #21829. 2022-04-18 16:32:30 +08:00
hufangzhou 18293e3e0d * Fix bug #15656. 2022-04-13 11:19:20 +08:00
hufangzhou 96eae06795 * Fix bug #15641. 2022-04-12 10:11:20 +08:00
hufangzhou 32da4b3b25 * Fix bug #16204. 2022-04-07 15:54:06 +08:00