Commit Graph
1655 Commits
Author SHA1 Message Date
zhujinyong d5560c2d35 + Add consumed and teamCount of projects for performance optimization. 2023-05-12 09:31:20 +08:00
wangyidong d91e7d1f11 * fix bug #34816. 2023-04-25 14:50:02 +08:00
tianshujie 5cb292635a * Fix bug #34691. 2023-04-24 15:51:40 +08:00
hufangzhou d1ef10c951 * Completion of language items. 2023-04-21 10:46:06 +08:00
wangyidong 6e1ba76617 * fix bug #34539. 2023-04-21 10:21:17 +08:00
hufangzhou e18b37128f Merge branch 'master' into zentaopms_304 2023-04-20 13:03:30 +08:00
caoyanyi 2f5b21ed76 * Modify page style. 2023-04-20 11:02:05 +08:00
tianshujie 557061330d * Change the color of the document name in the document list. 2023-04-20 10:41:26 +08:00
caoyanyi 89fa7d85de * Modify link style. 2023-04-20 10:30:49 +08:00
caoyanyi f276767617 Merge branch 'cyy_api' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_api 2023-04-20 10:27:04 +08:00
caoyanyi 0a277e85e5 * Modify doc index style. 2023-04-20 10:26:45 +08:00
tianshujie 3b777c1517 * Modify the document statistics block style. 2023-04-20 10:13:22 +08:00
caoyanyi ffac4c9567 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_fixbug 2023-04-20 09:12:48 +08:00
liumengyi 19870de8a0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-19 17:23:44 +08:00
wangyidong df01ad51ec * fix bug. 2023-04-19 17:03:49 +08:00
caoyanyi 7d0207ac87 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_fixbug 2023-04-19 16:21:15 +08:00
hufangzhou 438c55d059 * Merge code. 2023-04-19 16:18:56 +08:00
caoyanyi 658b918897 * Modify api view page style. 2023-04-19 16:16:30 +08:00
wangyidong d9e21d706a * fix bug #34362,34365,34361. 2023-04-19 14:50:43 +08:00
caoyanyi ce12f91dfa * Modify icon size. 2023-04-19 14:18:13 +08:00
liumengyi 7fe3662ea7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-19 14:09:20 +08:00
wangyidong 7659babe92 * fix bug #34364. 2023-04-19 13:55:17 +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 17c3ba6b68 * fix bug. 2023-04-19 10:08:38 +08:00
tianshujie 51cc9adb8f * Fix bug #34341. 2023-04-19 09:49:49 +08:00
wangyidong 64ee5c7625 * code for remove empty data in block. 2023-04-19 09:44:24 +08:00
liumengyi 168ebe2b56 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-19 09:08:44 +08:00
wangyidong dffb74c07d * code for task #91381. 2023-04-18 17:35:22 +08:00
hufangzhou 103cde4dae * Merge code. 2023-04-18 15:51:03 +08:00
caoyanyi 8f2d820a7b * Modify language. 2023-04-18 15:13:48 +08:00
tianshujie f9f3549e9d Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-04-18 14:18:27 +08:00
tianshujie 87f226f407 * Modify the document block style. 2023-04-18 14:18:14 +08:00
liumengyi b8e8c3d788 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-18 13:16:42 +08:00
wangyidong 0d31625643 * code for task #91388. 2023-04-18 13:05:14 +08:00
liumengyi e052fbb565 * Finish task #91355. 2023-04-18 11:13:30 +08:00
liumengyi 17ee6ad3f4 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-18 11:06:01 +08:00
tianshujie 59afadec4a * Code for task #91389,91390. 2023-04-18 09:03:43 +08:00
liumengyi d971d4b4b7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-18 08:38:14 +08:00
tianshujie 4c595d88d7 * Delete useless variables. 2023-04-18 08:37:10 +08:00
wangyidong 5399ec46be * code for task #91381. 2023-04-17 17:14:56 +08:00
hufangzhou 0e8f7d807c Merge branch 'master' into zentaopms_304 2023-04-17 08:30:02 +08:00
tianshujie beffe82709 * Code for task #43816. 2023-04-14 16:11:06 +08:00
tianshujie 2c1fb2826b * Code for story #43815. 2023-04-14 15:31:41 +08:00
liumengyi 648dc288ca Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-14 15:15:03 +08:00
guofeilong 938bb13c6c * Adjust code in doc block . 2023-04-14 10:04:44 +08:00
王怡栋 e6be417612 Merge branch 'master' into 'tsj_task'
# Conflicts:
#   module/doc/view/lefttree.html.php
2023-04-13 09:03:14 +00:00
guofeilong 60499b8226 * Adjust code for css in doc/index . 2023-04-13 16:56:28 +08:00
tianshujie 8d97ca43a5 * Resolve issue #768. 2023-04-13 16:44:31 +08:00
王怡栋 5ac6adcb09 Merge branch 'master' into 'cyy_fixbug'
# Conflicts:
#   module/doc/view/lefttree.html.php
2023-04-13 05:30:11 +00:00
朱金勇 bb531cfd2c * Fix bugs in dmdb. 2023-04-13 05:10:17 +00:00