Commit Graph
1379 Commits
Author SHA1 Message Date
孙广明 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
李玉春 aeaf877933 Update kanban.js 2022-03-02 05:11:04 +00:00
孙华伟 03b0221c99 * 2022-03-02 13:08:22 +08:00
孙华伟 fa34d9e024 * 2022-03-02 11:31:50 +08:00
孙华伟 51b7e615e0 * 2022-03-02 11:30:20 +08:00
孙华伟 5d61f31c3b * 2022-03-02 11:22:23 +08:00
孙华伟 abd00b8f08 * 2022-03-02 11:13:22 +08:00
孙华伟 33a2aec741 * 2022-03-02 11:00:51 +08:00
孙广明 b63fa55607 Merge branch 'pailei_zhangzilong_49297' into 'pailei'
* Finish task #49297.

See merge request easycorp/zentaopms!2029
2022-03-02 03:00:45 +00:00
孙华伟 0402049b85 * 2022-03-02 10:58:08 +08:00
zhangzilong 92f4d32a68 * Finish task #49297. 2022-03-02 10:57:48 +08:00
孙华伟 f4bed0d0c6 * 2022-03-02 10:28:01 +08:00
孙华伟 a282e6c0e6 *Story #30528. 2022-03-02 09:56:58 +08:00
xieqiyu e3b101a807 * Fix bug of foreach. 2022-03-02 09:36:54 +08:00
zhangzilong 2f38d907ee * Code for task #49297. 2022-03-02 09:07:15 +08:00
孙广明 5decf2cf6c Merge branch 'sprint/185_zhouxudong_19962' into 'pailei'
* Finish task #49696.

See merge request easycorp/zentaopms!1991
2022-03-02 00:31:17 +00:00
xieqiyu daefe27bf5 * Delete unused code. 2022-03-01 17:33:45 +08:00
xieqiyu 06af0ff6c4 * Code for task#49696. 2022-03-01 17:28:57 +08:00
孙华伟 23511a0472 *Story #30528. 2022-03-01 15:37:05 +08:00
孙广明 6873b1061f Merge branch 'sprint/185_xieqiyu_49304' into 'pailei'
Sprint/185 xieqiyu 49304

See merge request easycorp/zentaopms!2007
2022-03-01 07:04:26 +00:00
孙华伟 5b99190d32 * 2022-03-01 14:53:57 +08:00
zhangzilong d8178d01eb * Finish task #49297. 2022-03-01 14:27:16 +08:00