Commit Graph
714 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
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
wangjianhua cd5749835e * Add function setFielAndRealPaths to file model. 2022-11-09 23:28:37 +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
wangyuting2 d54ca95ff6 * Finish task #73838 ~ #73844. 2022-11-02 01:15:40 +00: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
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08: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
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 92e0ec8eae * Fix bug #26420. 2022-08-29 09:32:23 +08:00
hufangzhou fa9ea8cdca * Calculate height in html format. 2022-08-25 11:16:44 +08:00
hufangzhou c7f587ef5a * Fix bug #26359. Optimize detail styles for creating documents. 2022-08-12 15:05:00 +08:00
hufangzhou b44ed94231 * Finish task #62965. Fix bug #26130, #26129, #26120. 2022-08-08 16:31:20 +08:00
王怡栋 ec328f7432 Merge branch 'master' into 'sprint/hufangzhou_createdoc'
# Conflicts:
#   config/zentaopms.php
2022-08-08 03:05:17 +00:00
hufangzhou 5280ed4fc6 * Remove the unused code. 2022-08-08 11:02:06 +08:00
hufangzhou f8b34bc690 * Remove the unused code. 2022-08-08 10:56:49 +08:00
hufangzhou 6b9705e6c6 * Remove the uploader file in the first step of create doc. 2022-08-08 10:45:59 +08:00
hufangzhou 7ffe013d41 * Change the upload file control to uploader. 2022-08-04 10:24:26 +08:00
hufangzhou c5eb6c53d9 * Finish task #62962. 2022-08-03 10:49:55 +08: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 ba2a0bc08f * Fix bug #25820. 2022-07-28 14:46:27 +08:00
hufangzhou c4296b1b9f * Compatible with zentaomax. 2022-07-27 13:35:06 +08:00
hufangzhou 8883ac8e77 * Finish task #62132, #62133, #62134, #62135, #62136. 2022-07-26 18:14:09 +08:00
hufangzhou e5d4bf2ef0 * Adjust the style for document height. 2022-07-20 16:36:26 +08:00
hufangzhou fab8fedf10 * Adjust the judgment condition to a configuration item. 2022-07-20 14:15:43 +08:00
hufangzhou 1085813b49 * Adjust the tips of required fields. 2022-07-20 13:33:52 +08:00
hufangzhou d7c33d2859 * Adjust the height of basic info box. 2022-07-20 10:27:37 +08:00
hufangzhou 1dcf2dcb2c * Code for task #59750. 2022-07-20 10:13:21 +08:00
liumengyi 94992c299f * Fix bug #25336. 2022-07-15 09:44:01 +08:00
wangyidong c88aa6b8f1 Merge branch 'zentaomax35' 2022-07-04 14:16:06 +08:00
mayue 01fd78720c * Fix bug #24639. 2022-06-30 16:17:47 +08:00
mayue 2e3416c4c8 * Fix bug #24639. 2022-06-30 16:15:10 +08:00
liumengyi 076a744a0a * Fix bug #23914, #23999. 2022-06-30 13:58:18 +08:00
wangyidong 636facc057 * code for bug #24015. 2022-06-30 08:45:20 +08:00
孙广明 85ac450243 Merge branch 'sprint/207_mayue_bug#24049' into 'master'
* Fix bug #24049.

See merge request easycorp/zentaopms!4155
2022-06-27 08:54:19 +00:00
mayue 35383bc86f * Fix bug #24049. 2022-06-24 18:42:44 +08:00
liumengyi 3cbc219ad5 * Code review. 2022-06-24 14:18:31 +08:00
王怡栋 176239c74d Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.

See merge request easycorp/zentaopms!4122
2022-06-23 09:27:32 +00:00