Commit Graph
1754 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 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
hufangzhou fa9ea8cdca * Calculate height in html format. 2022-08-25 11:16:44 +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
zhouxin 607fa5a010 * Fix bug of doc-objectLib. 2022-08-17 02:16:03 +00:00
hufangzhou c7f587ef5a * Fix bug #26359. Optimize detail styles for creating documents. 2022-08-12 15:05:00 +08:00
hufangzhou 96506b7125 * Adjust spacing in whitelist. 2022-08-08 16:34:47 +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
liumengyi 756c8d4dc0 * Fix bug #26102. 2022-08-05 15:49:56 +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 7e93563e95 * Fix bug #25842. 2022-07-28 16:35:53 +08:00
hufangzhou ba2a0bc08f * Fix bug #25820. 2022-07-28 14:46:27 +08:00
hufangzhou a9f10fe868 * Remove the unsed code. 2022-07-27 17:40:31 +08:00
hufangzhou 6e9ba532ba * Fix bug #25743. 2022-07-27 16:20:21 +08:00
hufangzhou 96934390a2 * Move the from parameter to open source. 2022-07-27 15:44:44 +08:00
hufangzhou a94f93dceb * Fix bug #25758. 2022-07-27 15:27:47 +08:00
hufangzhou c4296b1b9f * Compatible with zentaomax. 2022-07-27 13:35:06 +08:00
hufangzhou 4c7699178a * Modify the object id equal zero for custom type doc. 2022-07-27 08:48:42 +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 9e54c0b55c * Change the if statement to toggleClass. 2022-07-20 14:27:08 +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
王怡栋 7e682c99c2 Merge branch 'sprint/xuanxuan_110' into 'master'
Sprint/xuanxuan 110

See merge request easycorp/zentaopms!4563
2022-07-15 03:17:39 +00:00
liumengyi 94992c299f * Fix bug #25336. 2022-07-15 09:44:01 +08:00
chaideqing 3532e82841 * fix card show blank above header 2022-07-11 15:29:26 +08:00
zenggang 030a3ea89f * Fix bug#24761 2022-07-07 08:27:31 +00: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
孙广明 05e02b7325 Merge branch 'sprint/207_mayue_bug#24602' into 'master'
* Fix bug #24602.

See merge request easycorp/zentaopms!4267
2022-06-30 07:11:05 +00:00
liumengyi 076a744a0a * Fix bug #23914, #23999. 2022-06-30 13:58:18 +08:00
mayue d012898134 * Fix bug #24602. 2022-06-30 13:44:37 +08:00