Commit Graph
30193 Commits
Author SHA1 Message Date
mayue ceb7030aeb * Optimize code. 2022-03-22 15:43:04 +08:00
mayue 4b4b04f19b * Optimize code. 2022-03-22 15:21:34 +08:00
mayue c09b24adbd * Fix bug #20098. 2022-03-22 13:50:19 +08:00
李玉春 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 129c55db39 * Delete useless judgment conditions. 2022-03-22 13:40:43 +08:00
caoyanyi 515de66bdc * Adjust code. 2022-03-22 13:40:23 +08:00
caoyanyi 1d68afd421 * Modify story create error. 2022-03-22 13:34:37 +08:00
tianshujie 303c546348 * Fix bug #20915. 2022-03-22 13:25:13 +08:00
李玉春 e811292dc9 Merge branch 'sprint/master_zhoxudong_14090' into 'master'
Sprint/master zhoxudong 14090

See merge request easycorp/zentaopms!2435
2022-03-22 05:12:46 +00:00
zhouxudong b65da66453 * Fix bug #14090. 2022-03-22 13:09:47 +08:00
tianshujie 1004f727ae * Modify language item. 2022-03-22 12:35:34 +08:00
zhouxudong 67045f3041 *Fix bug #14090. 2022-03-22 11:28:44 +08:00
王怡栋 cb715c23e9 Merge branch 'sprint/lite6_lwr_dynamic_order_styles' into 'master'
* fix dynamic order select styles, task #51310, bug #20973.

See merge request easycorp/zentaopms!2431
2022-03-22 03:16:10 +00:00
王怡栋 f79a07116b Merge branch 'sprint/lite6_lwr_hide_visions' into 'master'
* remove user vision field if there is no other vision available, task #51318, bug #20691.

See merge request easycorp/zentaopms!2407
2022-03-22 03:15:40 +00:00
王怡栋 890b8a39c6 Merge branch 'sprint/lite6_lwr_filter_deleted_lanes' into 'master'
* filter out deleted lanes, task #51311, bug #20972.

See merge request easycorp/zentaopms!2426
2022-03-22 03:14:12 +00:00
tianshujie acd514e738 * Fix bug #19251. 2022-03-22 11:13:38 +08:00
孙广明 867d93e7f5 Merge branch 'master_xieqiyu_20396' into 'master'
* Fix bug#20396.

See merge request easycorp/zentaopms!2432
2022-03-22 03:13:25 +00:00
王怡栋 6ed9d8fc31 Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug#20968,20997.

See merge request easycorp/zentaopms!2430
2022-03-22 03:11:38 +00:00
xieqiyu e2fbaa6828 * Fix bug#20396. 2022-03-22 11:10:44 +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
Wenrui LI 56053267c1 * fix where deleted condition of query. 2022-03-22 11:07:49 +08:00
Wenrui LI 4a36b134cd * fix hidden vision inputs. 2022-03-22 11:06:54 +08:00
Wenrui LI c53d0c6295 * fix dynamic order select styles, task #51310, bug #20973. 2022-03-22 11:03:33 +08:00
tianshujie 8cf4b3bcae * Fix bug #19261. 2022-03-22 11:01:14 +08:00
李玉春 73b13d19fe Merge branch 'sprint/pailei2_zhouxudong_15763' into 'master'
* Fix bug #15763.

See merge request easycorp/zentaopms!2417
2022-03-22 03:01:10 +00:00
王怡栋 28a23e9fce Merge branch 'sprint/fixbug_hufangzhou_17264' into 'master'
* Fix bug #17264.

See merge request easycorp/zentaopms!2423
2022-03-22 03:01:01 +00:00
zhouxudong b59845049b * Fix bug #15763. 2022-03-22 10:59:17 +08:00
Zongjun Lan 4d7ee95c09 * fix task #51347,#51307 2022-03-22 10:56:21 +08:00
zhujinyong 0cf390702c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-22 10:55:21 +08:00
tanghucheng 9370fcb1bf * Fix bug#20968,20997. 2022-03-22 10:55:19 +08:00
zhujinyong 0c39542c38 Merge branch 'Zentao_app1.1' 2022-03-22 10:55:09 +08:00
王怡栋 d0b4e05307 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-22 10:54:25 +08:00
王怡栋 ff30f9fa2f * adjust for init story for batch create task. 2022-03-22 10:53:26 +08:00
zhouxudong 39a58efedf * Fix bug #15763. 2022-03-22 10:53:22 +08:00
Wenrui LI e920e855eb * add hidden vision input if vision is not shown. 2022-03-22 10:51:40 +08:00
李玉春 976ee4e6c5 Merge branch 'fix_bug#20646' into 'master'
* Fix bug#20646.

See merge request easycorp/zentaopms!2428
2022-03-22 02:50:39 +00:00
tianshujie 10f8402f78 * Fix bug #20731. 2022-03-22 10:48:12 +08:00
李玉春 7127d6e8ab Merge branch 'sprint/master_zhoxudong_15984' into 'master'
* Fix bug #15984.

See merge request easycorp/zentaopms!2419
2022-03-22 02:43:35 +00:00
zhouxudong 541032f12e * Fix bug #15763. 2022-03-22 10:40:34 +08:00
Wenrui LI b232bd54fe * filter out deleted lanes, task #51311, bug #20972. 2022-03-22 10:39:28 +08:00
tianshujie b40e7699e5 * Fix bug #20731. 2022-03-22 10:37:32 +08:00
王怡栋 ffae3aa899 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-22 10:32:40 +08:00
王怡栋 25b0c39dcc * fix bug #21029. 2022-03-22 10:31:47 +08:00
李玉春 2019451473 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2421
2022-03-22 02:20:59 +00:00
hufangzhou b3003228e0 * Fix bug #17264. 2022-03-22 10:14:18 +08:00
tianshujie f4f3e18fbe * Fix bug #19004. 2022-03-22 10:07:56 +08:00
tianshujie 23b70dfa4e * Fix bug #19074. 2022-03-22 10:00:39 +08:00
zhouxudong d74e5c4c58 * Fix bug #15984. 2022-03-22 09:58:43 +08:00
zhujinyong e91bf2520c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-22 09:55:03 +08:00
tianshujie 682eeae9e9 * Fix global add kanban error report. 2022-03-22 09:54:36 +08:00