Commit Graph
54182 Commits
Author SHA1 Message Date
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
王怡栋 0af66d19bb Merge branch 'fixbug/liumengyi_33143' into 'master'
* Fix bug #33143.

See merge request easycorp/zentaopms!7460
2023-04-18 09:13:07 +00:00
王怡栋 3c85d5aac3 Merge branch 'cyy_fixbug' into 'master'
Cyy fixbug

See merge request easycorp/zentaopms!7457
2023-04-18 09:12:42 +00:00
wangyidong d9f382b101 * fix bug for delete api in api view. 2023-04-18 17:10:39 +08:00
caoyanyi f31f9ce8ed * Modify menu link. 2023-04-18 17:04:22 +08:00
guofeilong c2440a0ab2 * Adjust code for task #91379 . 2023-04-18 16:57:21 +08:00
朱金勇 a3bc8b32f1 * Fix bug#34105. 2023-04-18 08:36:52 +00:00
朱金勇 e62f6a4b25 * Fix install for dmdb. 2023-04-18 08:23:00 +00:00
刘刚 5d68147361 Merge branch 'goview' into 'master'
* Updata go-view dist.

See merge request easycorp/zentaopms!7459
2023-04-18 08:06:56 +00: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
qixinzhi 8382355b0d * Updata go-view dist. 2023-04-18 07:52:35 +00: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
caoyanyi 8f2d820a7b * Modify language. 2023-04-18 15:13:48 +08:00
朱金勇 1b024cd41b * Fix bug for attend. 2023-04-18 07:09:21 +00:00
liumengyi 62d73d2149 * Fix bug #33143. 2023-04-18 15:08:23 +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
王怡栋 a3648f0ec5 Merge branch 'goview' into 'master'
* Updata go-view dist.

See merge request easycorp/zentaopms!7455
2023-04-18 06:45:02 +00: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
王怡栋 dc1b7fa857 Merge branch 'dev/gfl_zentaopms_307' into 'master'
Dev/gfl zentaopms 307

See merge request easycorp/zentaopms!7456
2023-04-18 06:42: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
qixinzhi 03a537b900 * Updata go-view dist. 2023-04-18 06:33:33 +00: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
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
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
刘刚 5a4c096b16 Merge branch 'master_xieqiyu_addConfig' into 'master'
* Add config.

See merge request easycorp/zentaopms!7451
2023-04-18 05:24:06 +00:00
xieqiyu 421b7933b0 * Add config. 2023-04-18 05:22:38 +00:00
wangyidong 0d31625643 * code for task #91388. 2023-04-18 13:05:14 +08:00
朱金勇 d96a77e314 * Fix bug#34233. 2023-04-18 04:31:10 +00: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
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
liugang 44387b7b97 * Remove unused files extened in the report extension. 2023-04-18 03:00:10 +00:00