Commit Graph
2498 Commits
Author SHA1 Message Date
tianshujie dd8fa67a12 * Fix bug #34359. 2023-04-19 09:10:42 +08:00
tianshujie 06c8d50719 * Modify the editor style. 2023-04-19 09:09:26 +08:00
tianshujie c2d8da46ee Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-04-19 09:07:21 +08:00
王怡栋 e3b14714fb Merge branch 'cyy_fixbug' into 'master'
* Modify catalog sort.

See merge request easycorp/zentaopms!7463
2023-04-19 00:58:43 +00:00
caoyanyi 4396f3d1b4 * Adjust code. 2023-04-19 08:57:37 +08:00
guofeilong 06ec49b150 * Code for task #91380 . 2023-04-19 08:53:48 +08:00
caoyanyi 692fb9e6cc * Adjust code. 2023-04-19 08:47:44 +08:00
caoyanyi e15e696e8d * Modify catalog sort. 2023-04-19 08:44:27 +08:00
wangyidong dffb74c07d * code for task #91381. 2023-04-18 17:35:22 +08:00
王怡栋 a88eaaeace Merge branch 'dev/gfl_zentaopms_307' into 'master'
* Adjust code for task #91379 .

See merge request easycorp/zentaopms!7462
2023-04-18 09:13:54 +00:00
guofeilong c2440a0ab2 * Adjust code for task #91379 . 2023-04-18 16:57:21 +08:00
tianshujie f7d94114cb * Fixed a scrollbar style problem. 2023-04-18 16:27:13 +08:00
caoyanyi 75ba8174da * Modify tree catalog sort. 2023-04-18 16:05:25 +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
tianshujie 987e940fe1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-04-18 15:56:52 +08:00
tianshujie 59e850ed48 * Fix bug #34312. 2023-04-18 15:54:23 +08:00
tianshujie 9a439c9cd5 * Fix bug #34312. 2023-04-18 15:36:16 +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 ab04e42c0b * Fix bug #34316. 2023-04-18 14:44:27 +08:00
王怡栋 6c74871804 Merge branch 'tsj_fixbug' into 'master'
Tsj fixbug

See merge request easycorp/zentaopms!7453
2023-04-18 06:43:52 +00:00
guofeilong fa99c2a707 * Code for task #91379 . 2023-04-18 14:40:13 +08:00
guofeilong 46cefe5a4b * Adjust code for task #91379 . 2023-04-18 14:39:28 +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
tianshujie 61ff47b68a * Code for task #91378. 2023-04-18 13:53:11 +08:00
tianshujie 0f49022d88 * Fix bug #34260. 2023-04-18 13:49:55 +08:00
王怡栋 70a1625a13 Merge branch 'cyy_fixbug' into 'master'
* Fix bug #34288, Modify bottom height.

See merge request easycorp/zentaopms!7450
2023-04-18 05:49:05 +00:00
tianshujie d165ce39b9 * Code for task #91378. 2023-04-18 13:40:47 +08:00
wangyidong dcc3fd9331 * fix bug #34278. 2023-04-18 13:33:09 +08:00
caoyanyi eceeb4bd04 * Modify language. 2023-04-18 13:31:42 +08:00
wangyidong 0d31625643 * code for task #91388. 2023-04-18 13:05:14 +08:00
caoyanyi 77605330f2 * Modify catalog select style. 2023-04-18 11:16:24 +08:00
caoyanyi ab7bfba897 * Fix bug #34185, Modify sidebar-toggle. 2023-04-18 11:09:19 +08:00
tianshujie 775088ac63 * Fix bug #34276. 2023-04-18 11:05:14 +08:00
tianshujie b4dc730385 * Fix bug #34284. 2023-04-18 10:56:15 +08:00
caoyanyi 8104185c61 * Fix bug #34288, Modify bottom height. 2023-04-18 10:47:35 +08:00
tianshujie 9df90e87a5 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_sort 2023-04-18 10:44:37 +08:00
tianshujie 4a46d918b1 * Code for task #91391. 2023-04-18 10:43:03 +08:00
王怡栋 29f2ba65e3 Merge branch 'cyy_fixbug' into 'master'
* Fix bug #34293,34299.

See merge request easycorp/zentaopms!7444
2023-04-18 02:41:20 +00:00
guofeilong 367be9d52a * Code for task #91379 . 2023-04-18 10:36:34 +08:00
tianshujie 7605903fe9 * Fix bug #34274. 2023-04-18 10:29:48 +08:00
tianshujie 32161d8d66 * Code for task #91391. 2023-04-18 10:23:03 +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
wangyidong 0ef2c25165 * fix bug. 2023-04-18 09:16:34 +08:00
tianshujie b4c325c56e * Code for task #91378. 2023-04-18 09:13:45 +08:00
caoyanyi 07a5cb6f94 * Fix bug #34293,34299. 2023-04-18 09:07:50 +08:00
tianshujie 4a980b4d7c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_sort 2023-04-18 08:34:41 +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