Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
52,740 Commits 2 Branches 292 Tags
3412fe2fadc67655fcd03aa5d6e6890670ba9708
Commit Graph
636 Commits
Author SHA1 Message Date
tianshujie 484f34396c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 08:59:00 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
liumengyi 035c2ff35f * Fix bug of task #83949. 2023-02-09 09:44:09 +08:00
liumengyi c6841126ba * Finish task #83950. 2023-02-07 11:18:29 +08:00
zhouxin e56ac56ca3 * Resolve feedback #1807. 2022-12-21 07:58:28 +00:00
chaideqing b670a052de * Fix feedback1752. 2022-12-20 10:10:33 +08:00
zenggang b908e942a8 * Fix bug#29140 2022-11-29 06:35:11 +00:00
王怡栋 2a5333b298 * fix bug #15815. 2022-11-25 10:09:47 +08:00
wangjianhua d6b292ae14 Merge branch 'master' into master_oss_wangjianhua 2022-11-21 21:20:34 +08:00
wangyuting f71d6abf17 * Fix bug #29949. 2022-11-21 06:41:06 +00:00
wangjianhua 121e072d85 Merge branch 'master' into master_oss_wangjianhua 2022-11-16 16:36:36 +08:00
xieqiyu fde21ff897 * Fix bug#29549,#29654. 2022-11-11 17:06:48 +08:00
wangjianhua cd5749835e * Add function setFielAndRealPaths to file model. 2022-11-09 23:28:37 +08:00
wangyidong b32f2af9b7 * code for task #75236. 2022-11-09 10:30:30 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
tianshujie 9363788155 * Fix bug #29280. 2022-11-04 11:31:32 +08:00
tianshujie cf7a678b9b * Fix bug #29280. 2022-11-04 11:25:06 +08:00
wangyidong 99889da499 * code for task #74781. 2022-11-02 09:27:14 +08:00
wangyuting2 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
mayue 3952e3d312 * Fix bug #26945. 2022-08-26 15:22:00 +08:00
mayue b3008f2d19 * Optimize code. 2022-08-25 17:08:06 +08:00
mayue bc938caaa4 * Fix bug #26607. 2022-08-25 16:55:27 +08:00
mayue 3c7a896b3a * Fix bug #26607. 2022-08-25 13:33:56 +08:00
mayue 6336e232fb * Optimize code. 2022-08-23 11:01:31 +08:00
mayue 2f2f0e6542 * Optimize code. 2022-08-23 09:33:45 +08:00
王怡栋 ec328f7432 Merge branch 'master' into 'sprint/hufangzhou_createdoc' 
# Conflicts:
#   config/zentaopms.php
 2022-08-08 03:05:17 +00:00
wangyidong ebe6dd630f * fix bug #25921. 2022-08-03 10:35:41 +08:00
hufangzhou 48f500e5a8 * Code for task #62951. 2022-08-03 09:37:36 +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