 wangxuepeng
|
bd0979b334
|
* Fix bug 33045.
|
2023-03-17 07:17:07 +00:00 |
|
|
孙广明
|
bcc9e6a0b2
|
Merge branch 'bugfix/33054_lmy' into 'master'
* Fix bug #33054.
See merge request easycorp/zentaopms!7224
|
2023-03-17 05:23:30 +00:00 |
|
|
wangyidong
|
db49612b75
|
* fix bug #33059.
|
2023-03-17 13:06:38 +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 |
|
|
王怡栋
|
e980643cd7
|
Merge branch 'dev/gfl_fix_bug' into 'master'
* Code for bug #33060 .
See merge request easycorp/zentaopms!7225
|
2023-03-17 03:09:30 +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 |
|
|
liumengyi
|
d2632c11fd
|
* Fix bug #33054.
|
2023-03-17 03:06:40 +00:00 |
|
|
孙广明
|
10a4dac396
|
Merge branch 'pipeline_jenkins_ly' into 'master'
Pipeline jenkins ly
See merge request easycorp/zentaopms!7223
|
2023-03-17 02:46:20 +00: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 |
|
|
caoyanyi
|
7a51621ef4
|
Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-03-17 10:19:08 +08:00 |
|
|
caoyanyi
|
872a14aa0c
|
* Adjust code.
|
2023-03-17 10:18:54 +08:00 |
|
|
liyang
|
71501dbc69
|
* Fix xuanxuan notice.
|
2023-03-17 10:10:29 +08:00 |
|
|
tianshujie
|
cc84152bbd
|
Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-03-17 09:55:18 +08:00 |
|
|
tianshujie
|
4815187c32
|
* Code for fix bug #33035.
|
2023-03-17 09:54:59 +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 |
|
|
王怡栋
|
8cb51c6118
|
Merge branch 'dev/gfl_fix_bug' into 'master'
* Code for bug #32973.
See merge request easycorp/zentaopms!7220
|
2023-03-17 01:21:39 +00:00 |
|
|
guofeilong
|
ec80eedcc9
|
* Code for bug #32973.
|
2023-03-17 09:19:36 +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 |
|
|
liyang
|
f07ff0c0f7
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into pipeline_jenkins_ly
|
2023-03-17 08:18:10 +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 |
|
|
王怡栋
|
3535e7bc7f
|
Merge branch 'dev/gfl_fix_bug' into 'master'
* Code for bug #33000
See merge request easycorp/zentaopms!7219
|
2023-03-16 09:16:51 +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 |
|
|
王怡栋
|
c068ece5c8
|
Merge branch 'fixbug_tanghucheng' into 'master'
* Fix bug for export bug.
See merge request easycorp/zentaopms!7215
|
2023-03-16 08:31:52 +00:00 |
|
|
王怡栋
|
506bfa6bfa
|
Merge branch 'bug_33020' into 'master'
* Fix bug#33020
See merge request easycorp/zentaopms!7211
|
2023-03-16 08:31:33 +00:00 |
|
|
王怡栋
|
e0946d24b1
|
Merge branch 'bugfix/32991_lmy' into 'master'
* Fix bug #32991, #33018.
See merge request easycorp/zentaopms!7212
|
2023-03-16 08:30:21 +00:00 |
|
|
liumengyi
|
c18770de91
|
* Fix bug #32939.
|
2023-03-16 08:28:27 +00:00 |
|
|
wangyidong
|
414c928ab5
|
Merge branch 'tsj_fixbug'
|
2023-03-16 16:28:24 +08:00 |
|
|
王怡栋
|
031a63a433
|
Merge branch 'master' into 'tsj_fixbug'
# Conflicts:
# module/story/control.php
|
2023-03-16 08:27:36 +00:00 |
|
|
管西迎
|
3c193e60f3
|
Merge branch 'hufangzhou_bug_33008' into 'master'
* Fix bug #33008.
See merge request easycorp/zentaopms!7210
|
2023-03-16 08:24:24 +00:00 |
|
|
管西迎
|
c20fd40f8a
|
Merge branch 'sprint/hufangzhou_bug_32960' into 'master'
* Fix bug #32960.
See merge request easycorp/zentaopms!7214
|
2023-03-16 08:23:27 +00:00 |
|
|
hufangzhou
|
15c0a07a93
|
* Code for bug #32960.
|
2023-03-16 16:22:37 +08:00 |
|
|
tanghucheng
|
876f2bcc9e
|
* Fix bug for export bug.
|
2023-03-16 16:21:50 +08:00 |
|
|
tianshujie
|
1cb2dc55d4
|
* Code for fix bug #33014.
|
2023-03-16 16:21:33 +08:00 |
|
|
tianshujie
|
277ace51a0
|
Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-03-16 16:17:21 +08:00 |
|