Commit Graph
245 Commits
Author SHA1 Message Date
李玉春 2b1fee6181 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2433
2022-03-22 05:43:55 +00:00
tianshujie 303c546348 * Fix bug #20915. 2022-03-22 13:25:13 +08:00
王怡栋 792501cf85 Merge branch 'sprint/master_lanzongjun_version_lite' into 'master'
* fix task #51347,#51307

See merge request easycorp/zentaopms!2429
2022-03-22 03:09:56 +00:00
Zongjun Lan 4d7ee95c09 * fix task #51347,#51307 2022-03-22 10:56:21 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
zhouxudong 24963355c1 * Fix bug #10978. 2022-03-19 15:06:54 +08:00
zhouxudong b239f405f8 * Fix bug #10978. 2022-03-18 17:22:48 +08:00
tianshujie 63f53d23d6 * Fix bug #19321. 2022-03-15 17:04:56 +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
tianshujie a349c5bfeb * Fix bug #20530. 2022-03-09 14:01:41 +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
王怡栋 fb22e1dcb0 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug 50368

See merge request easycorp/zentaopms!2128
2022-03-08 07:54:22 +00: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
tianshujie 54ac0f8c8e * Finish task #50380. 2022-03-08 13:52:34 +08:00
xieqiyu 25ad53744a * Add selected lane when batch create bug in kanban. 2022-03-08 10:44:38 +08:00
Zongjun Lan b82a7e5f57 * fix bug 50368 2022-03-08 09:51:34 +08:00
孙华伟 f8eacb6726 *Story #31107. 2022-03-08 09:48:18 +08:00
xieqiyu b455987346 * Fix bug. 2022-03-07 13:02:17 +08:00
孙广明 7b962c4e38 Merge branch 'pailei' 2022-03-07 10:56:26 +08:00
孙华伟 d8bb8a903e * 2022-03-04 14:34:01 +08:00
Zongjun Lan 0512526c23 * fix bug 19713 2022-03-03 10:07:55 +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
李玉春 aeaf877933 Update kanban.js 2022-03-02 05:11:04 +00:00
孙华伟 5d61f31c3b * 2022-03-02 11:22:23 +08:00
孙华伟 abd00b8f08 * 2022-03-02 11:13:22 +08:00
孙华伟 a282e6c0e6 *Story #30528. 2022-03-02 09:56:58 +08:00
zhangzilong 2f38d907ee * Code for task #49297. 2022-03-02 09:07:15 +08:00
孙华伟 23511a0472 *Story #30528. 2022-03-01 15:37:05 +08:00
孙华伟 5b99190d32 * 2022-03-01 14:53:57 +08:00
孙华伟 af06215820 * 2022-03-01 14:20:06 +08:00
zhangzilong aff8bf40ef * Finish task #49297. 2022-03-01 11:19:01 +08:00
zhangzilong 1777586537 * Finish task #49297. 2022-03-01 10:59:25 +08:00
zhangzilong 83bf7d564a * Finish task #49297. 2022-03-01 10:13:43 +08:00
zhangzilong 868a293324 * 2022-03-01 10:05:30 +08:00
liumengyi 54fe05a303 * Fix bug #20103. 2022-02-28 15:16:36 +08:00
孙华伟 0ea4f15d4b * 2022-02-28 14:36:44 +08:00
zhouxudong 8a9824bc98 * Fix bug . 2022-02-24 15:28:01 +08:00
zhouxudong 88163d846f * Fix bug . 2022-02-24 15:22:12 +08:00
zhengrunyu 9f6eb6c7a5 * Remove (). 2022-02-24 11:27:02 +08:00
zhengrunyu 172b62dbfb * Fixbug 19953. 2022-02-24 11:18:44 +08:00
李玉春 9b4fe955ea Merge branch 'sprint/185_zhouxudong_19917' into 'sprint/185'
Sprint/185 zhouxudong 19917

See merge request easycorp/zentaopms!1923
2022-02-23 09:26:48 +00:00
周旭东 bc832bcf22 Update kanban.js 2022-02-23 09:20:20 +00:00
zhouxudong 6556130370 * Modify variable name. 2022-02-23 17:11:26 +08:00