Commit Graph
1400 Commits
Author SHA1 Message Date
tianshujie 74548de746 * Fix the problem of no Kanban after Kanban execution creation. 2022-03-16 12:54:13 +08:00
tianshujie bc03600b03 * Fix bug #19289. 2022-03-16 10:50:08 +08:00
李玉春 46222a0d13 Merge branch 'sprint/pailei2_zhouxudong23_50762' into 'pailei2'
Sprint/pailei2 zhouxudong23 50762

See merge request easycorp/zentaopms!2282
2022-03-16 00:46:23 +00:00
tianshujie 63f53d23d6 * Fix bug #19321. 2022-03-15 17:04:56 +08:00
zhouxudong 1847194fe7 * Finish task #50762. 2022-03-15 16:12:37 +08:00
孙广明 1f6c6363ba Merge branch 'pailei2_sj_50765' into 'pailei2'
fixbug #19324

See merge request easycorp/zentaopms!2268
2022-03-15 06:02:50 +00:00
李玉春 59ff30de9d Merge branch 'pailei2_sunhuawei_50407' into 'pailei2'
Pailei2 sunhuawei 50407

See merge request easycorp/zentaopms!2265
2022-03-15 05:43:03 +00:00
孙华伟 dd727476ad * Fix bug #17639. 2022-03-15 13:36:52 +08:00
李玉春 93d656dc0b Merge branch 'sprint/pailei2_zhouxudong_19967' into 'pailei2'
Sprint/pailei2 zhouxudong 19967

See merge request easycorp/zentaopms!2247
2022-03-15 05:28:44 +00:00
sunjun 316b989ffc fixbug #19324 2022-03-15 13:24:06 +08:00
zhouxudong 2cef18b917 * Finish task #50762 #50763. 2022-03-15 10:26:27 +08:00
zhouxudong fa85f99e59 * Fix bug #19967. 2022-03-14 17:05:18 +08:00
zhouxudong 2e4bb9c6ba * Fix bug #19967. 2022-03-14 16:37:13 +08:00
xieqiyu 96fc77e620 * Fix bug#17363. 2022-03-14 16:36:30 +08:00
孙广明 ff3d2c46e2 Merge branch 'sprint/pailei2_tianshujie_50402' into 'pailei2'
Sprint/pailei2 tianshujie 50402

See merge request easycorp/zentaopms!2239
2022-03-14 08:12:46 +00:00
孙广明 afb4010223 Merge branch 'pailei_sj_50431' into 'pailei2'
fix bug #50431

See merge request easycorp/zentaopms!2214
2022-03-14 06:20:37 +00:00
sunjun f105fc944f fixbug #50421 2022-03-14 11:20:34 +08:00
sunjun 9621a762f1 fixbug #50431 2022-03-14 11:05:55 +08:00
sunjun 8269e9229a fixbug #50431 2022-03-14 10:38:45 +08:00
tianshujie ccb9dfdf07 * Fix bug #17960. 2022-03-14 10:04:23 +08:00
sunjun 7411c4c4f3 fix bug #50431 2022-03-11 15:59:07 +08:00
孙广明 d69c8dd9dd Merge branch 'pailei_sj_50431' into 'pailei2'
bug增加必填标识

See merge request easycorp/zentaopms!2193
2022-03-11 01:03:22 +00:00
sunjun f69c9746b5 bug增加必填标识 2022-03-11 08:52:04 +08:00
mayue 00143907ce Fix bug #20545. 2022-03-09 16:49:03 +08:00
孙广明 4c218d7a69 Merge branch 'pailei_zhangzilong_49888' into 'pailei2'
Pailei zhangzilong 49888

See merge request easycorp/zentaopms!2155
2022-03-09 06:41:53 +00:00
xieqiyu 4ba238cd27 * Modify review code. 2022-03-09 14:36:50 +08:00
mayue 9f38f5cd10 * Fix bug #50240. 2022-03-09 13:27:42 +08:00
zhangzilong 1e58bc537c * Code for task #49888. 2022-03-09 10:51:37 +08:00
zhangzilong d04161c0cc * Code for task #49888. 2022-03-09 10:08:46 +08:00
zhangzilong 590ba16d6a * Code for task #49888. 2022-03-09 09:32:18 +08:00
孙广明 382c57984e Merge branch 'pailei_sunhuawei_story31107' into 'pailei2'
Pailei sunhuawei story31107

See merge request easycorp/zentaopms!2151
2022-03-09 01:14:21 +00:00
xieqiyu b68d3dda7e * Add selected lane when batch create story in kanban. 2022-03-08 21:14:06 +08:00
孙华伟 98311aca91 * 2022-03-08 14:54:10 +08:00
xieqiyu 944c0efdfe * Add selected lane when batch create in kanban. 2022-03-08 14:43:55 +08:00
孙华伟 67a0272d96 *Story #31107. 2022-03-08 14:41:51 +08:00
李玉春 3b79f9ce1c Merge branch 'sprint/pailei2_zhouxudong_fixbug' into 'pailei2'
* Fix bug #19962.

See merge request easycorp/zentaopms!2137
2022-03-08 06:40:16 +00:00
zhouxudong cbe21a49d8 * Fix bug #19962. 2022-03-08 10:56:25 +08:00
xieqiyu 25ad53744a * Add selected lane when batch create bug in kanban. 2022-03-08 10:44:38 +08:00
孙华伟 f8eacb6726 *Story #31107. 2022-03-08 09:48:18 +08:00
孙广明 7b962c4e38 Merge branch 'pailei' 2022-03-07 10:56:26 +08:00
tianshujie 5b2b646db3 * Fix bug #20328. 2022-03-04 16:29:56 +08:00
孙华伟 d8bb8a903e * 2022-03-04 14:34:01 +08:00
孙广明 af52c74832 Merge branch 'sprint/186_liumengyi_20293' into 'master'
* Fix bug #20290.

See merge request easycorp/zentaopms!2058
2022-03-03 06:55:22 +00:00
liumengyi 86d19f82f7 * Fix bug #20290. 2022-03-03 14:53:58 +08:00
Zongjun Lan 0512526c23 * fix bug 19713 2022-03-03 10:07:55 +08:00
孙华伟 c01323fdbb *Fix bug #20273 . 2022-03-03 09:40:43 +08:00
孙华伟 e0640737c2 *Fix bug #20273. 2022-03-03 09:34:41 +08:00
李玉春 a0da36e3f2 Merge branch 'pailei' into 'pailei_sunhuawei_story_30528'
# Conflicts:
#   module/execution/control.php
#   module/execution/view/kanban.html.php
2022-03-02 05:34:15 +00:00
孙华伟 8623e8553e :Merge branch 'pailei_sunhuawei_story_30528' of https://gitlab.zcorp.cc/easycorp/zentaopms into pailei_sunhuawei_story_30528 2022-03-02 13:16:58 +08:00
孙华伟 e7d721af85 * 2022-03-02 13:15:04 +08:00