Commit Graph
696 Commits
Author SHA1 Message Date
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
xieqiyu d4ac1b4a5f * Code for task#57850. 2022-06-23 17:20:19 +08:00
mayue fcb8b6bc9e * Fix bug #24175. 2022-06-23 16:32:06 +08:00
liumengyi 9b024fb293 * Fix bug #24166. 2022-06-23 15:48:48 +08:00
liumengyi 6f93912640 * Fix bug for doc search flipping. 2022-06-23 10:55:13 +08: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
sunjun ddd5818fc1 fixbug_doc 2022-06-22 09:10:27 +00:00
王怡栋 03c76b1565 Merge branch 'master' into 'sprint/206'
# Conflicts:
#   db/update17.1.sql
2022-06-22 07:26:11 +00: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 5ce8133079 * Fix bug for task #57891 #57890 #57889 #57886 #57885 #57892 #57887. 2022-06-22 10:58:57 +08: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
sunjun eafcb352c6 * Finish task #57891 #57890 #57889 #57886 #57885 #57892 #57887 2022-06-21 05:17:09 +00:00
mayue 2295ee69d5 * Fix bug #23868. 2022-06-17 14:55:25 +08:00
mayue 49db5d2b2e * Fix bug #23870#23868. 2022-06-17 14:12:47 +08:00