Commit Graph
105 Commits
Author SHA1 Message Date
guofeilong 418a6a5ff9 * Code for task #91379 . 2023-04-19 16:29:06 +08:00
wangyidong 4e05f5d566 * fix bug. 2023-04-19 15:15:25 +08:00
tianshujie b4dc730385 * Fix bug #34284. 2023-04-18 10:56:15 +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
wangyidong 3ee191bd66 * remove save path when create doc. 2023-04-14 09:49: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
wangyidong 548a0c453c * fix bug #33700. 2023-04-13 13:03:42 +08:00
guofeilong 53da287c46 * Code for task #90971. 2023-04-13 11:08:39 +08:00
wangyidong bf4c487742 * fix bug. 2023-04-12 17:00:48 +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
tianshujie 81e7153c8e * Code for task #90780. 2023-04-11 16:34:29 +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 1a32c02940 * fix bug #33914. 2023-04-10 17:36:53 +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
tianshujie bb84c7a731 * Change the name of my spatial function. 2023-04-06 16:57:14 +08:00
tianshujie 0e813c1ea3 * Refactoring list page. 2023-04-06 13:07:36 +08:00
wangyidong 56791f12ef * code for task #89916. 2023-04-06 10:29:23 +08:00
wangyidong 26d9d2ba55 * adjust for edit doc. 2023-03-31 17:54:29 +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 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 be1d498c5a * Code for task #87405. 2023-03-30 13:17:43 +08:00
wangyidong 1d27666ded * code for fromGlobal param. 2023-03-29 15:56:42 +08:00
liumengyi eb182b1874 * Fix bug #33461. 2023-03-29 13:36:16 +08:00
wangyidong 0677d7b5f5 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-29 10:40:11 +08:00
wangyidong efee93ff21 * code for task #89136. 2023-03-29 10:39:48 +08:00
liumengyi d4a8dbb88b * Fix bug of task #89149. 2023-03-29 09:16:48 +08:00
liumengyi be75bd716f * Finish task #89149, and fix bug of merge code. 2023-03-29 08:55:25 +08:00
wangyidong bb3c743d75 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-29 08:28:20 +08:00
wangyidong 4910b9b8e7 * code for task #89150. 2023-03-29 08:24:27 +08:00
tianshujie 3f6292ad7b * Code for task #89152. 2023-03-27 17:25:00 +08:00
tianshujie f818d387f2 * Code for task #89152. 2023-03-27 16:45:03 +08:00
liumengyi 28e31e4f23 * Code for task #89141. 2023-03-27 15:50:39 +08:00
tianshujie 26c1ccbb25 * code for task #89148. 2023-03-27 15:34:29 +08:00
mayue 933694703e * Fix bug #24580. 2022-06-30 11:00:28 +08:00
mayue 6fd3657052 * Fix bug #24479. 2022-06-28 16:34:27 +08:00
mayue 35383bc86f * Fix bug #24049. 2022-06-24 18:42:44 +08:00
mayue 49db5d2b2e * Fix bug #23870#23868. 2022-06-17 14:12:47 +08:00
mayue dc8e372a00 * Fix bug #23865#23869. 2022-06-17 11:18:25 +08:00
mayue 179191fd7d * Fix bug #23183. 2022-06-16 16:15:13 +08:00
hufangzhou 0424801e4e * Fix bug #15654. 2022-04-27 10:48:28 +08:00
孙广明 bff2f36c90 Merge branch 'sprint/181_liumengyi_fixbug' into 'master'
* Finish task #47090 #47098.

See merge request easycorp/zentaopms!1303
2022-01-06 09:25:15 +00:00