Commit Graph
1720 Commits
Author SHA1 Message Date
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
mayue 933694703e * Fix bug #24580. 2022-06-30 11:00:28 +08:00
wangyidong 636facc057 * code for bug #24015. 2022-06-30 08:45:20 +08:00
mayue 953d6c8f23 * Fix bug #24479. 2022-06-29 17:02:00 +08:00
wangyidong adedb487b5 * fix bug #24242. 2022-06-29 10:46:50 +08:00
孙广明 8eec750c83 Merge branch 'sprint/210_mayue_bug#24479' into 'master'
* Fix bug #24479.

See merge request easycorp/zentaopms!4196
2022-06-28 08:40:07 +00:00
mayue 6fd3657052 * Fix bug #24479. 2022-06-28 16:34:27 +08:00
mayue c1c145e4b7 * Fix bug #24482. 2022-06-28 16:27:10 +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
liumengyi 48532553f2 * Fix bug #24246. 2022-06-24 09:05:46 +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
王怡栋 85cbbc79bd Merge branch 'sprint/206_liumengyi_fixissue' into 'master'
* Fix issue #682, #683.

See merge request easycorp/zentaopms!4098
2022-06-23 05:49:02 +00:00
liumengyi 0400a2628a * Fix issue 682. 2022-06-23 13:09:10 +08:00
liumengyi 6f93912640 * Fix bug for doc search flipping. 2022-06-23 10:55:13 +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