Commit Graph
850 Commits
Author SHA1 Message Date
tanghucheng 0afa3c7613 * Fix #bug #31742, Project type project creation R&D requirements Upload attachments cannot be viewed from the document module. 2023-05-25 08:08:08 +00:00
songchenxuan c2ed55899f * Fix bug #34873 again. 2023-05-22 13:15:15 +08:00
songchenxuan b405cc7f82 * Revert code and fix bug #34873 again. 2023-05-19 13:37:50 +08:00
songchenxuan 81cd77d324 * Fix bug #34873, do not query myObjects at first, they can be found in the follwing sql, no need to repeat the search. 2023-05-19 09:38:41 +08:00
wangyidong 8ac03068e7 * fix bug #34928. 2023-04-28 15:32:11 +08:00
wangyidong e2ce3f7524 * fix bug. 2023-04-27 09:53:47 +08:00
wangyidong 697906a59a * fix bug for doc stat. 2023-04-27 09:51:28 +08:00
wangyidong 06f7aa8a48 * fix bug #34562. 2023-04-26 15:00:33 +08:00
wangyidong dfcdb5d99c * fix bug #34848. 2023-04-26 12:12:48 +08:00
wangyidong 575990b6a3 * fix bug #34846. 2023-04-26 11:27:40 +08:00
wangyidong d01395e6b0 * fix bug #34581. 2023-04-25 10:25:37 +08:00
wangyidong a6a329df2c * code for bug #34761. 2023-04-25 08:58:05 +08:00
tianshujie 5de561dc41 * Fix bug #34760. 2023-04-24 20:31:52 +08:00
wangyidong 88fa8fc839 * fix bug #34750. 2023-04-24 18:56:38 +08:00
tianshujie 000c800196 * Fix bug #34702. 2023-04-24 16:07:21 +08:00
tianshujie f69507ab2e * Fix bug #34684. 2023-04-24 14:42:45 +08:00
tianshujie e1cff545d6 * Fix bug #34676. 2023-04-24 14:31:31 +08:00
tianshujie 831932222b * Fix bug #34676. 2023-04-24 14:24:59 +08:00
tianshujie f18cde5955 * Fix bug #34601. 2023-04-23 10:58:23 +08:00
wangyidong 36889a4ea2 * fix bug. 2023-04-21 14:20:43 +08:00
wangyidong 48aa1ce2f7 * fix bug. 2023-04-21 14:02:24 +08:00
wangyidong 6e1ba76617 * fix bug #34539. 2023-04-21 10:21:17 +08:00
tianshujie e2c553cf02 * Modify the Create Document button. 2023-04-21 09:00:22 +08:00
caoyanyi ae153705d2 * Modify view style. 2023-04-19 16:57:07 +08:00
tianshujie 08b771ac3a * Fixed my spatial directory tree highlighting problem. 2023-04-19 14:18:27 +08:00
tianshujie 4146e5551a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-04-19 11:21:38 +08:00
wangyidong 506b786a33 * fix bug #34367. 2023-04-19 11:20:44 +08:00
tianshujie 32cf3c4d20 * Fix bug #34337. 2023-04-19 10:19:42 +08:00
caoyanyi 1675a74e5e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_fixbug 2023-04-18 15:58:28 +08:00
wangyidong 39138ca85b * fix bug. 2023-04-18 15:23:36 +08:00
caoyanyi b505f9cbad Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_fixbug 2023-04-18 14:57:30 +08:00
caoyanyi 5062f1f243 * Modify doc vision check. 2023-04-18 14:56:51 +08:00
tianshujie 338599b562 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-04-18 14:16:36 +08:00
wangyidong 0d31625643 * code for task #91388. 2023-04-18 13:05:14 +08:00
tianshujie 775088ac63 * Fix bug #34276. 2023-04-18 11:05:14 +08:00
caoyanyi 8e69054983 * Fix bug #32491, Adjust to no increase in traffic within 3 seconds. 2023-04-18 10:15:07 +08:00
caoyanyi 99ed7687cb * Fix bug #34292. 2023-04-18 09:48:51 +08:00
caoyanyi 07a5cb6f94 * Fix bug #34293,34299. 2023-04-18 09:07:50 +08:00
王怡栋 d78cb60d48 Merge branch 'master' into 'tsj_fixbug'
# Conflicts:
#   module/doc/model.php
#   module/group/lang/resource.php
2023-04-18 00:25:53 +00:00
tianshujie 04a8604aa6 * Fix bug #34295. 2023-04-18 08:22:38 +08:00
wangyidong fed027e5a7 * fix bug. 2023-04-17 17:39:42 +08:00
tianshujie 84712f0f51 * Fix bug #34297. 2023-04-17 17:26:07 +08:00
wangyidong 5399ec46be * code for task #91381. 2023-04-17 17:14:56 +08:00
王怡栋 cf9d4348ab Merge branch 'tsj_sort' into 'master'
Tsj sort

See merge request easycorp/zentaopms!7440
2023-04-17 08:42:15 +00:00
tianshujie 8fc7ca7525 * Code for task #91391. 2023-04-17 13:56:21 +08:00
tianshujie f4cda4d780 * Code for task #91378. 2023-04-17 10:57:00 +08:00
caoyanyi 159f604619 * Remove unused code. 2023-04-14 16:16:24 +08:00
caoyanyi 6c6461336f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_fixbug 2023-04-14 16:14:55 +08:00
wangyidong e5ff2093cb * code for change collector field to collects. 2023-04-14 16:14:42 +08:00
caoyanyi ab6f0c3259 * Add collections for doc view. 2023-04-14 16:13:52 +08:00