Commit Graph
378 Commits
Author SHA1 Message Date
guofeilong 367be9d52a * Code for task #91379 . 2023-04-18 10:36:34 +08:00
guofeilong af5e9ab505 * Code for task #91379 . 2023-04-17 15:58:39 +08:00
guofeilong e0bad0e4b2 * Code for bug #34193 . 2023-04-14 15:31:21 +08:00
caoyanyi 896f117c66 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_fixbug 2023-04-14 13:13:48 +08:00
guofeilong 8171ec17d0 * Code for task #34163 . 2023-04-14 10:34:27 +08:00
guofeilong 6051582370 * Adjust code for bug #34159 . 2023-04-14 10:23:06 +08:00
王怡栋 739a26440c Merge branch 'dev/gfl_zentaopms_305' into 'master'
* Adjust code for css in docDetail .

See merge request easycorp/zentaopms!7407
2023-04-14 02:07:49 +00:00
guofeilong 5e230d603c * Adjust code for bug #34159 . 2023-04-14 10:07:26 +08:00
wangyidong 3ee191bd66 * remove save path when create doc. 2023-04-14 09:49:57 +08:00
caoyanyi 123bb67c54 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_fixbug 2023-04-14 09:22:20 +08:00
caoyanyi 2c4f976c14 * Modify action edit style. 2023-04-14 09:16:57 +08:00
guofeilong 3fde846432 - Delete Func updateCrumbs . 2023-04-14 09:08:40 +08:00
guofeilong b7893e356d - Delete js and view code for crumbs in docDetail . 2023-04-14 08:40:47 +08:00
王怡栋 e6be417612 Merge branch 'master' into 'tsj_task'
# Conflicts:
#   module/doc/view/lefttree.html.php
2023-04-13 09:03:14 +00:00
tianshujie e279e91070 * Resolve issue #775. 2023-04-13 16:22:45 +08:00
wangyidong 8a69021d9b * code for issue #776. 2023-04-13 16:00:40 +08:00
王怡栋 5ac6adcb09 Merge branch 'master' into 'cyy_fixbug'
# Conflicts:
#   module/doc/view/lefttree.html.php
2023-04-13 05:30:11 +00:00
guofeilong b73c301143 * Code for task 90776 . 2023-04-13 13:27:03 +08:00
wangyidong 548a0c453c * fix bug #33700. 2023-04-13 13:03:42 +08:00
guofeilong 4b603d8495 * Adjust code for change icons . 2023-04-13 11:09:10 +08:00
guofeilong 53da287c46 * Code for task #90971. 2023-04-13 11:08:39 +08:00
caoyanyi 5e3b05aea8 * Code for bug #33953. 2023-04-13 11:03:45 +08:00
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