Commit Graph
39387 Commits
Author SHA1 Message Date
caoyanyi fa03cbe0fc * Fix bug #29974. 2022-11-18 11:23:33 +08:00
caoyanyi 05d9cef073 * Fix bug #29957. 2022-11-17 16:52:31 +08:00
王怡栋 93a772e01e * fix bug #29834. 2022-11-17 14:01:33 +08:00
王怡栋 fc2945ccbd Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-17 11:11:34 +08:00
王怡栋 2b7f25bc6c * fix bug #29838. 2022-11-17 11:10:17 +08:00
王怡栋 3cd2f91458 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix task #76409

See merge request easycorp/zentaopms!6215
2022-11-17 02:13:19 +00:00
王怡栋 2e081b8df3 Merge branch 'zentaopms_258_bug#29639' into 'master'
* Fix bug #29639.

See merge request easycorp/zentaopms!6214
2022-11-17 02:13:05 +00:00
lanzongjun 6b7b4ae6c2 * Fix task #76409 2022-11-17 10:06:22 +08:00
wangyuting 34b1911104 * Fix bug #29639. 2022-11-17 02:03:43 +00:00
王怡栋 8ae7bd1a00 Merge branch 'sprint/zentaopms262_mayue_bug#28841' into 'master'
* Fix bug #28841.

See merge request easycorp/zentaopms!6208
2022-11-17 02:02:55 +00:00
王怡栋 ec4c6b47a8 Merge branch 'master_xieqiyu_76406' into 'master'
* Fix bug#29831.

See merge request easycorp/zentaopms!6211
2022-11-17 02:02:43 +00:00
王怡栋 b834f7f703 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix task #76408

See merge request easycorp/zentaopms!6210
2022-11-17 02:01:46 +00:00
mayue f08a8ccf92 * Remove story stage for edit. 2022-11-17 10:01:34 +08:00
王怡栋 a4902975fd Merge branch 'master_xieqiyu_76420' into 'master'
* Fix bug#29716.

See merge request easycorp/zentaopms!6209
2022-11-17 02:01:27 +00:00
王怡栋 468ae934f4 Merge branch 'master_xieqiyu_code' into 'master'
* Fallback code for bug#29896.

See merge request easycorp/zentaopms!6207
2022-11-17 02:00:50 +00:00
王怡栋 734837ad2e Merge branch 'sprint/zentaopms262_mayue_bug#29817' into 'master'
* Fix bug #29817.

See merge request easycorp/zentaopms!6212
2022-11-17 01:58:10 +00:00
mayue 5de7f12729 * Fix bug #29817. 2022-11-17 09:57:15 +08:00
王怡栋 6425496407 Merge branch 'zentaopms261_wyd' 2022-11-17 09:55:27 +08:00
王怡栋 6c0a92fa65 * adjust for sync build to release. 2022-11-17 09:40:51 +08:00
xieqiyu 3a0d499acf * Fix bug#29831. 2022-11-17 09:28:31 +08:00
lanzongjun f7506fa050 * Fix task #76408 2022-11-17 09:23:02 +08:00
xieqiyu 0de7525880 * Fix bug#29716. 2022-11-17 09:05:40 +08:00
mayue 617ebf6d8d * Fix bug #28841. 2022-11-17 08:45:30 +08:00
xieqiyu 9e8cd23ebd * Optimize code. 2022-11-17 08:44:24 +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
xieqiyu 679f2641aa * Fallback code for bug#29896. 2022-11-16 17:19:43 +08:00
王怡栋 0fdbf58dc9 * adjust code. 2022-11-16 17:09:07 +08:00
王怡栋 f4452f6d04 * fix for link story and bug for project release. 2022-11-16 17:06:12 +08: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
孙广明 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