 liyang
|
06e60cd462
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into ta_liyang
|
2022-11-17 08:21:15 +08:00 |
|
|
孙广明
|
eb7a0f44db
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix bug execution menu
See merge request easycorp/zentaopms!6204
|
2022-11-16 09:21:15 +00:00 |
|
|
孙广明
|
fb274164f6
|
Merge branch 'sprint/scx_userapi' into 'master'
Sprint/scx userapi
See merge request easycorp/zentaopms!6203
|
2022-11-16 09:21:03 +00:00 |
|
|
lanzongjun
|
75d9b5ceb9
|
* Fix bug execution menu
|
2022-11-16 17:01:58 +08:00 |
|
|
王怡栋
|
6b8fba345d
|
Merge branch 'feedback_1231' into 'master'
* Fix feedback#1231
See merge request easycorp/zentaopms!6202
|
2022-11-16 08:48:12 +00:00 |
|
|
liyang
|
4058d33d5d
|
* Fix function of generate test data.
|
2022-11-16 16:46:33 +08:00 |
|
|
liyang
|
db654da942
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into ta_liyang
|
2022-11-16 16:40:06 +08:00 |
|
|
宋辰轩
|
4692b3e26e
|
* Don not check password strength.
|
2022-11-16 16:31:03 +08:00 |
|
|
Yagami
|
3c2716ce6b
|
Merge branch 'sprint/master_lanzongjun_fixbug'
|
2022-11-16 16:29:16 +08:00 |
|
|
孙广明
|
46a1701d05
|
Merge branch 'master' into 'sprint/master_lanzongjun_fixbug'
# Conflicts:
# module/project/lang/de.php
# module/project/lang/en.php
# module/project/lang/fr.php
|
2022-11-16 08:29:00 +00:00 |
|
|
宋辰轩
|
cdb40c8190
|
* Modify user api bug.
|
2022-11-16 16:27:09 +08:00 |
|
|
zenggang
|
8370d27ee4
|
* Fix feedback#1231
|
2022-11-16 08:24:12 +00:00 |
|
|
孙广明
|
c65ab1e6c7
|
Merge branch 'master_xieqiyu_76421' into 'master'
* Fix bug#29540.
See merge request easycorp/zentaopms!6201
|
2022-11-16 08:21:53 +00:00 |
|
|
孙广明
|
8cbc53ab73
|
Merge branch 'master_xieqiyu_29896' into 'master'
* Fix bug#29896.
See merge request easycorp/zentaopms!6199
|
2022-11-16 08:21:42 +00:00 |
|
|
孙广明
|
78ec2d5420
|
Merge branch 'master_xieqiyu_76417' into 'master'
* Fix bug#29744.
See merge request easycorp/zentaopms!6195
|
2022-11-16 08:21:29 +00:00 |
|
|
xieqiyu
|
982cc38e5f
|
* Fix bug#29540.
|
2022-11-16 16:15:26 +08:00 |
|
|
lanzongjun
|
d07579f5eb
|
* fix bug #29877#29878
|
2022-11-16 15:52:08 +08:00 |
|
|
xieqiyu
|
2a7493ac78
|
* Fix bug#29896.
|
2022-11-16 15:48:18 +08:00 |
|
|
王怡栋
|
8848d5c462
|
Merge branch 'sprint/tianshujie_css' into 'master'
* Adjust plan box of create project pager.
See merge request easycorp/zentaopms!6198
|
2022-11-16 07:29:38 +00:00 |
|
|
王怡栋
|
6cc66fad4f
|
Merge branch 'sprint/180beta1_hufangzhou_newVersion' into 'master'
* Add the new version.
See merge request easycorp/zentaopms!6197
|
2022-11-16 07:29:23 +00:00 |
|
|
王怡栋
|
53afef4a2c
|
Merge branch 'sprint/feedback1441' into 'master'
Sprint/feedback1441
See merge request easycorp/zentaopms!6196
|
2022-11-16 07:28:29 +00:00 |
|
|
王怡栋
|
b87eee11ec
|
Merge branch 'zentaopms_258_bug#29666' into 'master'
* Fix bug #29666.
See merge request easycorp/zentaopms!6191
|
2022-11-16 07:28:07 +00:00 |
|
|
王怡栋
|
6f485d3797
|
Merge branch 'zentaopms_261_release_linkstory' into 'master'
* Get stories of project build when link story.
See merge request easycorp/zentaopms!6193
|
2022-11-16 07:27:18 +00:00 |
|
|
王怡栋
|
e969873a84
|
Merge branch 'zentaopms_258_bug#29692' into 'master'
* Fix bug #29692.
See merge request easycorp/zentaopms!6190
|
2022-11-16 07:26:48 +00:00 |
|
|
王怡栋
|
dfbe3f202e
|
Merge branch 'zentaopms_258_bug#29704' into 'master'
* Fix bug #29704.
See merge request easycorp/zentaopms!6189
|
2022-11-16 07:26:31 +00:00 |
|
|
王怡栋
|
9e0c3de9da
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
change story
See merge request easycorp/zentaopms!6188
|
2022-11-16 07:26:11 +00:00 |
|
|
tianshujie
|
7360831837
|
* Adjust plan box of create project pager.
|
2022-11-16 15:23:18 +08:00 |
|
|
hufangzhou
|
3dae19302b
|
* Add the new version.
|
2022-11-16 06:34:29 +00:00 |
|
|
xieqiyu
|
a11c4187be
|
* Fix bug#29744.
|
2022-11-16 13:59:26 +08:00 |
|
|
chaideqing
|
3c4ee4bf5a
|
* Fix feedback1441 another file.
|
2022-11-16 13:59:07 +08:00 |
|
|
lanzongjun
|
a628acfd0b
|
fix code error
|
2022-11-16 13:52:56 +08:00 |
|
|
daitingting
|
f321bc24d8
|
* Get stories of project build when link story.
|
2022-11-16 05:36:35 +00:00 |
|
|
wangyuting
|
5771eac9c8
|
* Fix bug #29666.
|
2022-11-16 05:34:42 +00:00 |
|
|
wangyuting
|
eb8f8bac5e
|
* Fix bug #29692.
|
2022-11-16 05:29:40 +00:00 |
|
|
wangyuting
|
594e24f884
|
* Fix bug #29704.
|
2022-11-16 05:19:19 +00:00 |
|
|
王怡栋
|
9470e2ca69
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-11-16 13:08:15 +08:00 |
|
|
王怡栋
|
2bb3cd3371
|
Merge branch 'fixbug'
|
2022-11-16 13:08:00 +08:00 |
|
|
王怡栋
|
1a4d187866
|
Merge branch 'zentaopms261_wyd' into 'master'
* fix bug #29733.
See merge request easycorp/zentaopms!6187
|
2022-11-16 05:06:13 +00:00 |
|
|
王怡栋
|
29c32632c0
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-11-16 13:04:58 +08:00 |
|
|
王怡栋
|
d3e3335599
|
* fix bug #29727.
|
2022-11-16 13:03:50 +08:00 |
|
|
lanzongjun
|
9e0ac41d78
|
change story
|
2022-11-16 11:31:21 +08:00 |
|
|
tanghucheng
|
3ce0869e1a
|
* Replace '' to helper::dbIN for release linkStory.
|
2022-11-16 11:28:40 +08:00 |
|
|
王怡栋
|
f2acb4f648
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* finish task #76394#76402
See merge request easycorp/zentaopms!6181
|
2022-11-16 03:16:58 +00:00 |
|
|
王怡栋
|
9b58baca07
|
Merge branch 'zentaopms_258_bug#29559'
|
2022-11-16 11:16:03 +08:00 |
|
|
王怡栋
|
d948227908
|
Merge branch 'master' into 'zentaopms_258_bug#29559'
# Conflicts:
# module/common/lang/menu.php
|
2022-11-16 03:15:19 +00:00 |
|
|
王怡栋
|
8b1146e5d1
|
Merge branch 'zentaopms_258_bug#29705' into 'master'
* Fix bug #29705.
See merge request easycorp/zentaopms!6183
|
2022-11-16 03:14:48 +00:00 |
|
|
王怡栋
|
cc1300242b
|
Merge branch 'zentaopms_258_bug#29708' into 'master'
* Fix bug #29708.
See merge request easycorp/zentaopms!6182
|
2022-11-16 03:14:31 +00:00 |
|
|
chaideqing
|
197fcd24c3
|
* Fix feedback #1441.
|
2022-11-16 11:10:20 +08:00 |
|
|
王怡栋
|
e04c30fa3b
|
* fix bug #29733.
|
2022-11-16 11:00:44 +08:00 |
|
|
tanghucheng
|
47398d1cf0
|
* Fix bug #29869.
|
2022-11-16 10:52:53 +08:00 |
|