Commit Graph
54202 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
tianshujie 3062276963 * Check whether the field already exists. 2023-04-19 09:05:13 +08:00
朱金勇 55e12b687e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-04-19 01:01:32 +00: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
朱金勇 b310d35aac * Fix bug#34345. 2023-04-19 00:57:05 +00:00
王怡栋 a2eddc80bc Merge branch 'dev/gfl_zentaopms_307' into 'master'
* Code for task #91380 .

See merge request easycorp/zentaopms!7464
2023-04-19 00:56:21 +00:00
guofeilong 06ec49b150 * Code for task #91380 . 2023-04-19 08:53:48 +08:00
朱金勇 2ca80b1aa3 * Fix bug#34346. 2023-04-19 00:53:12 +00: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
王怡栋 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
tianshujie f7d94114cb * Fixed a scrollbar style problem. 2023-04-18 16:27:13 +08: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
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
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
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
tianshujie f91245b985 * Fix bug #34315. 2023-04-18 15:14:45 +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
tianshujie 1fe920f873 * Compatible with Quick Edition project dropdown issues. 2023-04-18 15:04:09 +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
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
王怡栋 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