Commit Graph
337 Commits
Author SHA1 Message Date
wangyidong a3715fa226 * fix bug. 2023-04-12 16:20:53 +08:00
guofeilong e8d43fe0b0 * Code for task #90776 . 2023-04-12 13:37:48 +08:00
guofeilong 685b9489b2 * Adjust code for style in crumbs . 2023-04-12 10:34:14 +08:00
wangyidong 599a06266c * code for task #90775. 2023-04-11 16:49:51 +08:00
王怡栋 432f029a2f Merge branch 'dev/gfl_task' into 'master'
* Code for task #89913 .

See merge request easycorp/zentaopms!7370
2023-04-11 08:47:14 +00:00
wangyidong 594364c4e0 * code for task #90775. 2023-04-11 16:44:09 +08:00
guofeilong 661e26fb97 * Code for task #89913 . 2023-04-11 16:43:22 +08:00
guofeilong 3ff45d64ef * Code for add logic to show outlineMenu . 2023-04-11 16:09:50 +08:00
guofeilong c0be59e7e3 * Code for bug print view while bread more than two . 2023-04-11 15:10:31 +08:00
guofeilong a8a4faae24 * Code for task #90776 . 2023-04-11 14:39:53 +08:00
王怡栋 857b57b6eb Merge branch 'cyy_task' into 'master'
Cyy task

See merge request easycorp/zentaopms!7355
2023-04-11 06:05:51 +00:00
guofeilong 08614f32d1 * Code for task #90834 . 2023-04-11 13:59:22 +08:00
caoyanyi 64d0ac3c6a * Code for task #89912. 2023-04-11 09:54:32 +08:00
王怡栋 18dc5f2d59 Merge branch 'master' into 'release/zentaopms_18.3'
# Conflicts:
#   module/doc/control.php
#   module/doc/css/view.css
#   module/doc/js/view.js
2023-04-11 01:17:43 +00:00
guofeilong 9505ba7e47 * Adjust code for fix bug . 2023-04-11 09:10:35 +08:00
guofeilong 298dd970d2 * Code for css refactors in tableContents . 2023-04-11 09:02:28 +08:00
王怡栋 bc3daacc3c Merge branch 'tsj_block' into 'master'
* Code for task #90778.

See merge request easycorp/zentaopms!7348
2023-04-11 00:36:04 +00:00
王怡栋 f1bf266118 Merge branch 'sprint/cyy_90971' into 'master'
* Code for task #90971.

See merge request easycorp/zentaopms!7345
2023-04-11 00:35:44 +00:00
tianshujie 66d0694599 * Code for task #90778. 2023-04-10 17:15:26 +08:00
guofeilong ab58e9c244 * Code for css refactors in view . 2023-04-10 16:31:04 +08:00
caoyanyi e164c7be4d * Code for task #90971. 2023-04-10 16:13:54 +08:00
tianshujie a3fdbebef5 * Fix bug #33970. 2023-04-10 15:17:14 +08:00
guofeilong c5dbf389bf * Code for css refactors in view . 2023-04-10 15:01:50 +08:00
guofeilong a01b8c2078 * Code for add func to click in closeBtn . 2023-04-10 13:35:46 +08:00
tianshujie a669f56285 * Code for task #89910. 2023-04-10 11:24:09 +08:00
guofeilong f6114edda0 * Adjut code for js in doc . 2023-04-07 16:27:32 +08:00
guofeilong 37a6ad5a0b * Add mr to swapper dom in tableContent . 2023-04-07 15:54:57 +08:00
guofeilong 0b3d379106 * Adjust code for css in view . 2023-04-07 15:40:25 +08:00
wangyidong 56ae0cf008 * code for task #89916. 2023-04-07 12:30:10 +08:00
tianshujie adb4e70bda Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-07 11:30:05 +08:00
tianshujie 3a30a4e65a * Code for task #89910,89911. 2023-04-07 11:29:34 +08:00
guofeilong 09339199c1 * Adjust code for module view . 2023-04-07 11:12:19 +08:00
guofeilong 3cf6f46f62 * Code for task #89913 . 2023-04-07 10:21:57 +08:00
tianshujie 639e36d34c Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-06 17:03:16 +08:00
tianshujie bb84c7a731 * Change the name of my spatial function. 2023-04-06 16:57:14 +08:00
guofeilong 828cc038ec * Adjust code . 2023-04-06 16:46:47 +08:00
tianshujie 8dcb58fdc3 * Add a jump and highlight to the left tree. 2023-04-06 16:01:39 +08:00
tianshujie 8be6397778 * Fixed an issue where the document was not clickable. 2023-04-06 15:32:45 +08:00
tianshujie c5d2bc5c17 * Code for task #89915. 2023-04-05 17:02:03 +08:00
tianshujie 1e77c10378 * Code for task #89915. 2023-04-05 15:54:25 +08:00
tianshujie 1bd3209351 * Code for task #89915. 2023-04-04 14:37:45 +08:00
wangyidong e4ac679475 * code for task #89166. 2023-04-03 10:52:16 +08:00
wangyidong 31f4f00d76 * code for task #89523. 2023-03-31 16:00:11 +08:00
tianshujie a93d9724d2 * Modify the position of the Favorites button. 2023-03-31 11:23:14 +08:00
tianshujie 4f0953139c * Code for task #87405. 2023-03-31 10:59:40 +08:00
wangyidong dffd6e5579 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-31 08:27:31 +08:00
wangyidong efc419ca6e * code for task #89166. 2023-03-30 17:36:19 +08:00
tianshujie 82ff6b2e0c Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-30 17:32:38 +08:00
tianshujie 4c5c8dcfb3 * Modifying style problem. 2023-03-30 17:32:23 +08:00
guofeilong 36e9cd3b2c Adjust code . 2023-03-30 17:24:00 +08:00