Commit Graph
1795 Commits
Author SHA1 Message Date
Yagami fa0b93874d * Code for markdown preview bug. 2022-12-12 16:55:33 +08:00
zenggang 82948abf2b * Fix bug#25845 2022-12-02 07:20:59 +00: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
王怡栋 d16ba0ba54 Merge branch 'zentaopms_263_bug#29949' into 'master'
* Fix bug #29949.

See merge request easycorp/zentaopms!6283
2022-11-21 08:53:55 +00:00
wangyuting f71d6abf17 * Fix bug #29949. 2022-11-21 06:41:06 +00:00
wangyuting 05a652d5fe * Fix bug #29950. 2022-11-21 06:08:46 +00:00
wangjianhua 121e072d85 Merge branch 'master' into master_oss_wangjianhua 2022-11-16 16:36:36 +08:00
chaideqing 3c4ee4bf5a * Fix feedback1441 another file. 2022-11-16 13:59:07 +08:00
chaideqing 197fcd24c3 * Fix feedback #1441. 2022-11-16 11:10:20 +08:00
xieqiyu fde21ff897 * Fix bug#29549,#29654. 2022-11-11 17:06:48 +08:00
wangzemei bd32b35659 * fix bug 29464 29473 2022-11-11 10:24:45 +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
孙广明 e9b3e073e7 Merge branch 'cyy_bug' into 'master'
* Code for bug #29366.

See merge request easycorp/zentaopms!6072
2022-11-08 03:05:06 +00:00
caoyanyi 828aa2ae64 * Adjust code. 2022-11-08 08:54:55 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
caoyanyi 2bd70bc4f3 * Code for bug #29366. 2022-11-07 17:22:03 +08:00
wangyuting2 0cefde5d28 * Optimize code for review code. 2022-11-04 06:35:21 +00: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
王怡栋 c534fb0065 Merge branch 'zentaopms_239_wyd' into 'zentaopms_239'
Zentaopms 239 wyd

See merge request easycorp/zentaopms!5980
2022-11-02 03:57:36 +00:00
wangyidong 99889da499 * code for task #74781. 2022-11-02 09:27:14 +08:00
wangyuting2 d54ca95ff6 * Finish task #73838 ~ #73844. 2022-11-02 01:15:40 +00:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
caoyanyi ae5705c1e1 * Fix bug #29030. 2022-10-27 11:22:03 +08:00
wangyidong d6dc22d7e0 * adjust for scroll to selected. 2022-10-26 09:39:05 +08:00
tianshujie bc72a89801 * Finish task #72374. 2022-10-17 16:59:43 +08:00
tianshujie e05f1e7f89 * Finish task #72374. 2022-10-17 16:58:30 +08:00
wangyuting2 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
王怡栋 51d8ba9d4d Merge branch 'sprint/hufangzhou_template' into 'master'
* Fix the bug which autofill the title for creating doc.

See merge request easycorp/zentaopms!5537
2022-09-27 00:26:35 +00:00
zenggang 282c148704 * Fix bug#27927 2022-09-26 04:06:07 +00:00
hufangzhou e9408ae4ae * Fix the bug which autofill the title for creating doc. 2022-09-26 08:49:17 +08:00
daitingting fb14ecd593 * Finish task #69719. 2022-09-23 05:18:41 +00:00
wangyidong 63e5df239e * code for task #69248. 2022-09-16 15:18:41 +08:00
王怡栋 b1c87862f2 Merge branch 'master' into 'sprint/237_liumengyi_fixbug'
# Conflicts:
#   module/doc/css/createbasicinfo.css
2022-09-09 07:18:21 +00:00
liumengyi 52bdcfb8d1 * Fix bug. 2022-09-09 13:07:54 +08:00
liumengyi d2deaca78e * Fix bug. 2022-09-09 13:07:25 +08:00
tianshujie 490c0f8791 * Fix bug #27281. 2022-09-09 10:10:17 +08:00
hufangzhou c77fde0166 * Code for bug #25840. 2022-09-02 13:48:50 +08:00
hufangzhou 159fcd07e7 * Fix bug #25840. 2022-09-02 13:37:05 +08:00
hufangzhou abd43d06af * Fix bug #26544. 2022-08-31 13:23:12 +08:00
hufangzhou 92e0ec8eae * Fix bug #26420. 2022-08-29 09:32:23 +08:00
mayue 3952e3d312 * Fix bug #26945. 2022-08-26 15:22:00 +08:00
孙广明 259e8e2e84 Merge branch 'sprint/max43_mayue_bug#26607' into 'master'
* Fix bug #26607.

See merge request easycorp/zentaopms!5119
2022-08-25 09:10:28 +00: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