Commit Graph
43065 Commits
Author SHA1 Message Date
tianshujie 8944424005 * Code for finish task #87405. 2023-03-21 16:01:35 +08:00
caoyanyi 0362953766 * Modify annex lib locate. 2023-03-21 14:41:15 +08:00
caoyanyi f01144ae0a * Modify api lib param. 2023-03-21 14:07:16 +08:00
caoyanyi 6e4cd0dda8 * Modify doc module locate. 2023-03-21 14:04:37 +08:00
guofeilong 256029b799 * Adjust code / 2023-03-21 11:22:28 +08:00
guofeilong 8b799b8b5f * Adjust code . 2023-03-21 10:23:01 +08:00
caoyanyi a20d44da79 * Add locate for module tree. 2023-03-21 10:11:57 +08:00
tianshujie 8a985934e2 * Code for finish task #88081. 2023-03-21 09:37:41 +08:00
caoyanyi 219bc64db6 * Add doc page dropdown. 2023-03-21 09:33:39 +08:00
tianshujie 76f9f21288 * Code for finish task #88081. 2023-03-21 09:27:00 +08:00
guofeilong 14e434c11a * Code for task spliter . 2023-03-21 09:26:05 +08:00
田淑杰 036fe270cd * Code for finish task #87406. 2023-03-20 16:26:19 +08:00
田淑杰 92f8c14b52 * Code for finish task #87406. 2023-03-20 16:21:29 +08:00
guofeilong 15ab08380b * Adjust code . 2023-03-20 16:13:14 +08:00
田淑杰 e1ee99ac6f * Code for finish task #87420. 2023-03-20 15:01:13 +08:00
田淑杰 e223267649 * Code for finish task #87420. 2023-03-20 11:23:57 +08:00
guofeilong cd169f412f * Adjust code . 2023-03-17 14:46:26 +08:00
guofeilong 6ae2d73b24 * Adjust code . 2023-03-17 14:39:53 +08:00
guofeilong a802947147 * Adjust code . 2023-03-17 13:26:17 +08:00
caoyanyi ea4513d895 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-17 13:22:59 +08:00
田淑杰 08c5fea6dc * Code for finish task #87411. 2023-03-17 13:17:41 +08:00
wangyidong db49612b75 * fix bug #33059. 2023-03-17 13:06:38 +08:00
tianshujie a6789488b5 * Finish task #87411. 2023-03-17 11:31:10 +08:00
王怡栋 6ee765c362 Merge branch 'tsj_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!7222
2023-03-17 03:10:31 +00:00
guofeilong d2f0e788fa * Code for bug #33060 . 2023-03-17 11:08:31 +08:00
tianshujie bd8dc27a36 * Code for bug #32987. 2023-03-17 11:07:00 +08:00
wangyidong c905c9a331 * fix for doc when upgrade. 2023-03-17 10:39:19 +08:00
tianshujie 9a3e8158dd Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-17 10:37:50 +08:00
tianshujie 2955d16b91 * Code for fix bug #27599. 2023-03-17 10:37:32 +08:00
guofeilong ad9b0affbc * Adjust code . 2023-03-17 10:32:12 +08:00
caoyanyi 872a14aa0c * Adjust code. 2023-03-17 10:18:54 +08:00
caoyanyi 4669b0218c * Adjust code. 2023-03-17 09:54:55 +08:00
caoyanyi 6712de8a01 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-17 09:51:21 +08:00
caoyanyi 675a28f888 * Modify editor default style. 2023-03-17 09:51:01 +08:00
Yagami 4c88c29318 * Fix bug #33009. 2023-03-17 09:14:07 +08:00
孙广明 5a69ec2c98 Merge branch 'wxp_bug32706' into 'master'
* Fix bug 32706.

See merge request easycorp/zentaopms!7195
2023-03-17 00:52:21 +00:00
孙广明 d9470a5d73 Merge branch 'wxp_bug23998' into 'master'
# Fixed #bug23998.

See merge request easycorp/zentaopms!7213
2023-03-17 00:52:09 +00:00
wangxuepeng 8dcfe4a48a * Fix bug 32706. 2023-03-17 00:48:22 +00:00
wangyidong 7dc5533817 * fix bug #33002. 2023-03-17 08:48:22 +08:00
tianshujie a120ba4255 * Code for finish task #87411. 2023-03-17 08:36:32 +08:00
tianshujie ec33fc9c86 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-17 08:28:02 +08:00
王怡栋 9919cd1372 Merge branch 'tsj_fixbug' into 'master'
* Modify user priv language.

See merge request easycorp/zentaopms!7217
2023-03-16 09:17:39 +00:00
guofeilong 2921c625d4 * Code for bug #33000 2023-03-16 17:14:02 +08:00
tianshujie 41589a2f53 Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-16 17:12:34 +08:00
tianshujie cb7b7561c4 * Fixed an issue where requirement concepts are inconsistent across
language items.
2023-03-16 17:11:31 +08:00
管西迎 62b7579400 Merge branch 'hufangzhou_revertCode' into 'master'
- Revert the code for BI nav.

See merge request easycorp/zentaopms!7218
2023-03-16 08:41:10 +00:00
管西迎 497ac481b8 Merge branch 'bugfix/32939_lmy' into 'master'
* Fix bug #32939.

See merge request easycorp/zentaopms!7216
2023-03-16 08:40:00 +00:00
caoyanyi d249ea3c26 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-16 16:38:47 +08:00
hufangzhou 60e1885ccb * Revert the code for BI nav. 2023-03-16 16:38:24 +08:00
caoyanyi 3e36d0bbae * Modify user priv language. 2023-03-16 16:37:16 +08:00