Commit Graph
48079 Commits
Author SHA1 Message Date
王怡栋 72106fa341 Merge branch 'master_feedback_1468' into 'master'
* Adjust code for feedback #1468.

See merge request easycorp/zentaopms!6300
2022-11-22 08:02:34 +00:00
王怡栋 827f04e98a * fix bug #30094. 2022-11-22 15:34:40 +08:00
王怡栋 a1cded3942 Merge branch 'zentaopms_263_task#77131' 2022-11-22 15:08:29 +08:00
王怡栋 0699b9e061 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-22 15:07:51 +08:00
Yagami 8c7611d8c3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-22 15:05:14 +08:00
Yagami 9e0c890def * Fix task list bug. 2022-11-22 15:05:04 +08:00
王 于听 81b50aa44b Merge branch 'master' into 'zentaopms_263_task#77131'
# Conflicts:
#   module/build/lang/de.php
#   module/build/lang/en.php
#   module/build/lang/fr.php
#   module/build/lang/zh-cn.php
2022-11-22 07:04:14 +00:00
王怡栋 b996270738 * code for task #77138. 2022-11-22 14:56:48 +08:00
liuhong d44f253a49 * Adjust code for feedback #1468. 2022-11-22 06:50:35 +00:00
王怡栋 c8abe9f23a Merge branch 'zentaopms_263_task#77140' into 'master'
* Finish task #77140.

See merge request easycorp/zentaopms!6297
2022-11-22 06:39:17 +00:00
Yagami b9eba9ce2e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-22 14:27:57 +08:00
Yagami e4a80e800d * Finish task #76953. 2022-11-22 14:27:38 +08:00
wangyuting befbe1f3d7 * Finish task #77131、#77142、#77141. 2022-11-22 06:09:07 +00:00
wangyuting 8c6753ea42 * Finish task #77140. 2022-11-22 06:03:51 +00:00
王怡栋 18d88bad03 Merge branch 'tianshujie_fixbug' into 'master'
* Fixed pager jump error in the use case list.

See merge request easycorp/zentaopms!6294
2022-11-22 06:01:41 +00:00
王怡栋 44caf18a51 Merge branch 'zentaopms_263_task#77130' into 'master'
* Finish task #77130.

See merge request easycorp/zentaopms!6292
2022-11-22 06:01:07 +00:00
王怡栋 a2d5371030 * code for task #77138,77135,77134,77133,77132,77129. 2022-11-22 13:54:33 +08:00
Yagami 0a4c64e9a7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-22 13:53:55 +08:00
Yagami a9bc199c38 * Finish task #77279. 2022-11-22 13:53:40 +08:00
王怡栋 bac4eeab8b * code for task #77135. 2022-11-22 13:39:28 +08:00
孙广明 f29f4aede8 Merge branch 'master_xieqiyu_77250' into 'master'
* Fix bug#30050.

See merge request easycorp/zentaopms!6295
2022-11-22 05:38:46 +00:00
孙广明 ece5e8f3df Merge branch 'sprint/zentaopms262_mayue_bug#30031' into 'master'
* Fix bug #30031.

See merge request easycorp/zentaopms!6293
2022-11-22 05:38:14 +00:00
孙广明 664a05a6f3 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix Task #77009#76458

See merge request easycorp/zentaopms!6291
2022-11-22 05:37:12 +00:00
lanzongjun 57bd3ad304 * Fix Task #76458 2022-11-22 13:35:54 +08:00
tianshujie d042a0e437 * Adjust color of pri label. 2022-11-22 13:31:20 +08:00
Yagami 0976b82629 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-22 13:22:05 +08:00
Yagami ae3bbae974 * Finish task #76491. 2022-11-22 13:21:44 +08:00
xieqiyu 95b35e03a2 * Fix bug#30050. 2022-11-22 13:21:38 +08:00
tianshujie 672bbadffe * Removes the type prompt on the project list page name under the product. 2022-11-22 13:18:49 +08:00
王怡栋 3ac62d87a1 * code for task #77138. 2022-11-22 12:07:53 +08:00
tianshujie a04c00387d * Fixed pager jump error in the use case list. 2022-11-22 11:32:04 +08:00
Yagami 02580a0465 * Cannot remove product link when story in execution. 2022-11-22 11:17:40 +08:00
mayue 1654280bbf * Fix bug #30031. 2022-11-22 11:07:10 +08:00
Yagami 3a3374437a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-22 11:02:44 +08:00
Yagami a4bf3c06d0 * Finish task #76972. 2022-11-22 11:02:24 +08:00
wangyuting 5cb3016f3f * Finish task #77130. 2022-11-22 03:01:03 +00:00
王怡栋 816abf82d4 Merge branch 'zentaopms_263_task#77136' into 'master'
* Finish task #77136.

See merge request easycorp/zentaopms!6290
2022-11-22 02:24:55 +00:00
lanzongjun 85130bfb02 * Fix Task #77009 2022-11-22 10:20:59 +08:00
孙广明 f689432ec8 Merge branch 'sprint/zentaopms262_mayue_bug#29958' into 'master'
* Fix bug #29958.

See merge request easycorp/zentaopms!6275
2022-11-22 02:19:26 +00:00
mayue 94bf632389 * Fix bug #29958. 2022-11-22 10:15:33 +08:00
wangyuting 748335e401 * Finish task #77136. 2022-11-22 02:13:02 +00:00
孙广明 d0c9b474ff Merge branch 'master_xieqiyu_76946' into 'master'
* Fix bug#30027.

See merge request easycorp/zentaopms!6289
2022-11-22 02:05:50 +00:00
孙广明 70eb171c39 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix Task #76951

See merge request easycorp/zentaopms!6287
2022-11-22 02:04:54 +00:00
xieqiyu 46879558bb * Fix bug#30027. 2022-11-22 09:52:08 +08:00
王怡栋 3b6b770d72 * fix bug #30068. 2022-11-22 09:45:05 +08:00
Yagami abfb4b13dd Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-22 09:30:45 +08:00
Yagami ae9764ebd1 * Finish task #77013. 2022-11-22 09:30:28 +08:00
孙广明 dc1a388812 Merge branch 'sprint/zentaopms262_mayue_bug#28841' into 'master'
* Fix bug #28841.

See merge request easycorp/zentaopms!6288
2022-11-22 01:24:39 +00:00
mayue 74f26f478f * Fix bug #28841. 2022-11-22 09:15:08 +08:00
王怡栋 d30344e2ca * fix bug #29555. 2022-11-22 09:01:12 +08:00