Commit Graph
1687 Commits
Author SHA1 Message Date
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
王怡栋 c69384617a Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.

See merge request easycorp/zentaopms!4083
2022-06-23 00:39:25 +00:00
孙广明 4b1d8f4fe5 Merge branch 'sprint/206_liumengyi_24133' into 'master'
* Fix bug #24133.

See merge request easycorp/zentaopms!4078
2022-06-23 00:27:35 +00:00
sunjun b76b5ae8fc fixbug_custom 2022-06-22 09:29:11 +00:00
liumengyi 2bc2c16cc5 * Fix bug #24133. 2022-06-22 17:27:36 +08: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
tianshujie e2669481c7 * Added German and French. 2022-06-22 15:28:45 +08:00
王怡栋 03c76b1565 Merge branch 'master' into 'sprint/206'
# Conflicts:
#   db/update17.1.sql
2022-06-22 07:26:11 +00:00
mayue c3109321a6 * Fix bug #24049; 2022-06-22 15:04:28 +08:00
xieqiyu 21b0217aa8 * Code for task#57850. 2022-06-22 13:15:44 +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 38f48bd103 * Optimize code for task#57892. 2022-06-22 11:08:42 +08:00
liumengyi 5ce8133079 * Fix bug for task #57891 #57890 #57889 #57886 #57885 #57892 #57887. 2022-06-22 10:58:57 +08:00
liumengyi 2fce450bb8 * Fix bug for task #58063. 2022-06-22 09:54:08 +08:00
孙广明 1ebe8d8f06 Merge branch 'sprint/207_mayue_bug#23982' into 'master'
* Fix bug #23982.

See merge request easycorp/zentaopms!4049
2022-06-22 01:49:36 +00:00
mayue 0ae4dc0878 * Fix bug #23982. 2022-06-22 09:19:32 +08:00
liumengyi 8c229fa6bc * Finish task #58063. 2022-06-22 08:59:29 +08:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
sunjun eafcb352c6 * Finish task #57891 #57890 #57889 #57886 #57885 #57892 #57887 2022-06-21 05:17:09 +00:00
zenggang dff6937dc4 * Adjust code 2022-06-20 09:29:29 +00:00
zenggang 2564d2d60b * Finish task#57903 2022-06-20 09:27:56 +00:00
mayue 2295ee69d5 * Fix bug #23868. 2022-06-17 14:55:25 +08:00
孙广明 0a00dfe217 Merge branch 'sprint/203_mayue_bug#23865#23869' into 'master'
* Fix bug #23865#23869.

See merge request easycorp/zentaopms!4000
2022-06-17 06:15:36 +00:00
mayue 49db5d2b2e * Fix bug #23870#23868. 2022-06-17 14:12:47 +08:00
zhouxin a6c7038d6c * Code for review. 2022-06-17 03:19:45 +00:00
mayue dc8e372a00 * Fix bug #23865#23869. 2022-06-17 11:18:25 +08:00
mayue 88c7c0222b * Optimize code. 2022-06-16 16:34:13 +08:00
mayue 179191fd7d * Fix bug #23183. 2022-06-16 16:15:13 +08:00
孙广明 f51b7998d5 * Code for bug #23508. 2022-06-13 10:21:28 +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
孙广明 a55b27a1c0 * Fix html tag bug. 2022-06-09 09:17:10 +08:00
孙广明 91199908ce * Code for task #56547. 2022-06-09 08:57:56 +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
Hao Sun 4185bd47e1 * bug #23284, fix simplemde error. 2022-06-07 03:14:44 +00:00
孙广明 42ed017780 * Fix bug #23252. 2022-06-06 13:13:38 +08:00
孙广明 61ad544156 Merge branch 'zentaopms_198' 2022-06-02 15:04:56 +08:00
孙广明 358ff4bd2f * Fix doc bug. 2022-06-01 15:05:43 +08:00
王怡栋 cbad6ae17c Merge branch 'sgm_55844' into 'zentaopms_198'
* Finish task #55844.

See merge request easycorp/zentaopms!3683
2022-06-01 06:30:25 +00:00
孙广明 fba70b09d5 * Remove unused code. 2022-06-01 14:29:08 +08:00