Commit Graph
44653 Commits
Author SHA1 Message Date
hufangzhou fc6225e37d * Init system resources. 2023-04-18 16:25:00 +08:00
hufangzhou 103cde4dae * Merge code. 2023-04-18 15:51:03 +08:00
hufangzhou 73e42f27cd * Adjust the init data method. 2023-04-18 15:46:01 +08:00
胡方舟 ca8f702765 Merge branch 'zenops_69' into 'master'
* getXmindImport,showXmindImport,saveXmindImport use importXmind permission.

See merge request easycorp/zentaopms!7458
2023-04-18 07:44:26 +00:00
zhaoke 186d901af7 * getXmindImport,showXmindImport,saveXmindImport use importXmind permission. 2023-04-18 15:41:38 +08:00
wangyidong 39138ca85b * fix bug. 2023-04-18 15:23:36 +08:00
liumengyi 83972bcaa6 * Fix bug of manage priv. 2023-04-18 14:47:35 +08:00
王怡栋 248d0c30f3 Merge branch 'cyy_fixbug' into 'master'
* Modify unlink file.

See merge request easycorp/zentaopms!7454
2023-04-18 06:44:42 +00: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
caoyanyi 2f962c8f2e * Modify unlink file. 2023-04-18 14:28:12 +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
tianshujie 338599b562 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-04-18 14:16:36 +08:00
liumengyi 31df3c1913 * Fix bug #34317. 2023-04-18 14:03:06 +08:00
tianshujie 61ff47b68a * Code for task #91378. 2023-04-18 13:53:11 +08:00
王怡栋 f79c5063a4 Merge branch 'fixbug/liumengyi_33917' into 'master'
* Fix bug #33917.

See merge request easycorp/zentaopms!7452
2023-04-18 05:50:39 +00: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
hufangzhou 6a457eba04 Merge branch 'master' into zentaopms_304 2023-04-18 13:42:05 +08: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
liumengyi 094f8f5f60 * Fix bug #33917. 2023-04-18 13:31:58 +08:00
caoyanyi eceeb4bd04 * Modify language. 2023-04-18 13:31:42 +08:00
hufangzhou d15a17586e * Fix bug #33925. 2023-04-18 13:30:36 +08:00
xieqiyu 421b7933b0 * Add config. 2023-04-18 05:22:38 +00:00
liumengyi b8e8c3d788 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-18 13:16:42 +08:00
liumengyi 689b765faf * Fix bug of manage priv by package. 2023-04-18 13:16:22 +08:00
wangyidong 0d31625643 * code for task #91388. 2023-04-18 13:05:14 +08:00
朱金勇 c9637a0418 * Fix bug#34305. 2023-04-18 04:22:09 +00:00
朱金勇 72c289b854 * Fix bug#34247. 2023-04-18 04:11:46 +00:00
caoyanyi 77605330f2 * Modify catalog select style. 2023-04-18 11:16:24 +08:00
liumengyi e052fbb565 * Finish task #91355. 2023-04-18 11:13:30 +08:00
caoyanyi ab7bfba897 * Fix bug #34185, Modify sidebar-toggle. 2023-04-18 11:09:19 +08:00
liumengyi 64a0db7ff0 Merge branch 'zentaopms_304' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-18 11:06:16 +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
hufangzhou 00ab038bbf * Code for task #91375. 2023-04-18 11:05:43 +08:00
tianshujie 775088ac63 * Fix bug #34276. 2023-04-18 11:05:14 +08:00
liugang 44387b7b97 * Remove unused files extened in the report extension. 2023-04-18 03:00:10 +00: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
王怡栋 af4d04889c Merge branch 'fixbug/liumengyi_34022' into 'master'
* Fix bug #34022, #34028.

See merge request easycorp/zentaopms!7446
2023-04-18 02:41:41 +00: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