Commit Graph
997 Commits
Author SHA1 Message Date
hufangzhou a56b8e49f3 * Fix bug #40741. 2023-11-17 13:10:57 +08:00
tanghucheng 71babf2920 Merge branch '18.8.1' into 18.x 2023-10-27 04:39:19 -04:00
hufangzhou c6824fbe25 * Finish task #104622. 2023-10-19 15:58:21 +08:00
Lufei 749b07d8ea * Use mb_strtoupper instead of strtoupper. 2023-10-18 17:25:52 +08:00
songchenxuan 109e70900d * Fix bug #37122. 2023-08-09 01:15:23 +08:00
sunguangming 62074493ba * Code for project stats block speed. 2023-08-09 15:56:44 +08:00
songchenxuan b969dd0b49 * Finish task #99982. 2023-08-08 11:27:56 +08:00
hufangzhou 8e806cee21 * Fix bug #36650. 2023-07-20 14:57:11 +08:00
hufangzhou 867321bd21 * Finish task #98017. 2023-07-18 13:27:20 +08:00
tanghucheng 3741c9b6fa Merge branch '18.x' into zentaoipd 2023-07-03 13:36:29 +08:00
hufangzhou c5d5ffcb75 * Fix bug #36043. 2023-06-21 15:28:56 +08:00
zhujinyong 36eab43b4a * Performance for welcome block. 2023-06-13 11:56:28 +08:00
zhujinyong 154a3b8d77 * Don't query from db in loop. 2023-06-13 08:44:37 +08:00
Yagami b215c001df * Fix bug #35382. 2023-05-18 14:50:48 +08:00
Yagami 3bb0da0578 * Fix bug #35151. 2023-05-16 16:44:44 +08:00
Yagami ffd2b525c8 * Change judgment condition. 2023-05-04 17:05:52 +08:00
tianshujie 5cb292635a * Fix bug #34691. 2023-04-24 15:51:40 +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 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
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
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 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