Commit Graph
356 Commits
Author SHA1 Message Date
wangyidong bf4c487742 * fix bug. 2023-04-12 17:00:48 +08:00
wangyidong 4180510b79 * fix bug #33994. 2023-04-12 15:20:32 +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
王怡栋 a0868cb0ff Merge branch 'master' into 'tsj_dynamic'
# Conflicts:
#   module/doc/model.php
2023-04-11 08:46:26 +00:00
tianshujie 81e7153c8e * Code for task #90780. 2023-04-11 16:34:29 +08:00
guofeilong 3ff45d64ef * Code for add logic to show outlineMenu . 2023-04-11 16:09:50 +08:00
王怡栋 ebe7eb7217 Merge branch 'dev/gfl_task#90776' into 'master'
Dev/gfl task#90776

See merge request easycorp/zentaopms!7360
2023-04-11 06:44:46 +00:00
wangyidong 9bba7c624d * code for task #90783. 2023-04-11 14:44:09 +08:00
guofeilong a8a4faae24 * Code for task #90776 . 2023-04-11 14:39:53 +08:00
guofeilong f175fa66e1 * Adjust code for task #90834 . 2023-04-11 14:03:34 +08:00
guofeilong 08614f32d1 * Code for task #90834 . 2023-04-11 13:59:22 +08:00
wangyidong 73ed3946e2 * code for task #90784. 2023-04-11 11:19:22 +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
wangyidong 1a32c02940 * fix bug #33914. 2023-04-10 17:36:53 +08:00
guofeilong a01b8c2078 * Code for add func to click in closeBtn . 2023-04-10 13:35:46 +08:00
wangyidong 7aa7c4285d * fix bug #33916. 2023-04-10 11:05:21 +08:00
wangyidong dc53b8f931 * fix bug #33910. 2023-04-10 11:05:21 +08:00
王怡栋 852c816439 Merge branch 'release/zentaopms_18.3' into 'master'
Release/zentaopms 18.3

See merge request easycorp/zentaopms!7334
2023-04-07 09:39:10 +00:00
wangyidong 6042806e2a * fix bug #33916. 2023-04-07 17:38:21 +08:00
wangyidong 56d2615fb4 * fix bug #33910. 2023-04-07 17:38:21 +08:00
guofeilong f6114edda0 * Adjut code for js in doc . 2023-04-07 16:27:32 +08:00
wangyidong 37f33ac3b8 * fix bug #33910. 2023-04-07 16:23:34 +08:00
guofeilong 87fa888809 * Adjust code for add text-primary to icon history . 2023-04-07 15:31:20 +08:00
guofeilong 94ecc551e2 * Adjust code for event click in history . 2023-04-07 13:36:17 +08:00
tianshujie bb84c7a731 * Change the name of my spatial function. 2023-04-06 16:57:14 +08:00
wangyidong 718c8141c9 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-06 14:01:07 +08:00
tianshujie 0e813c1ea3 * Refactoring list page. 2023-04-06 13:07:36 +08:00
wangyidong 85f5056b33 * code for task #89916. 2023-04-06 11:25:08 +08:00
wangyidong a5421e4940 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-06 10:30:52 +08:00
wangyidong 56791f12ef * code for task #89916. 2023-04-06 10:29:23 +08:00
tianshujie 1bd3209351 * Code for task #89915. 2023-04-04 14:37:45 +08:00
wangyidong 26d9d2ba55 * adjust for edit doc. 2023-03-31 17:54:29 +08:00
wangyidong 31f4f00d76 * code for task #89523. 2023-03-31 16:00:11 +08:00
liumengyi a0ccbb4475 * Fix bug #33609. 2023-03-31 14:25:05 +08:00
wangyidong e24a70f5b7 * code for task #89150. 2023-03-31 10:46:52 +08:00
wangyidong 0fc0b37f6b * code for task #89166. 2023-03-31 10:32:35 +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 e74879d72b * Code for task #89485. 2023-03-30 16:58:29 +08:00
caoyanyi f34e599ce1 * Modify left tree to common. 2023-03-30 16:54:36 +08:00
guofeilong 4c552c2175 * Adjust code . 2023-03-30 16:14:54 +08:00
liumengyi aeb24656f9 * Fix bug of task #89144. 2023-03-30 14:33:33 +08:00
guofeilong b3b42dbbf1 Adjust code . 2023-03-30 14:08:51 +08:00
guofeilong f075ada185 * Adjust code . 2023-03-30 13:52:36 +08:00
guofeilong 6a39183729 * Adjust code . 2023-03-30 13:47:13 +08:00
guofeilong 038edf5f32 * Adjust code . 2023-03-30 13:23:49 +08:00
tianshujie 7be3cb6929 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-30 13:18:09 +08:00
tianshujie be1d498c5a * Code for task #87405. 2023-03-30 13:17:43 +08:00