Commit Graph
2407 Commits
Author SHA1 Message Date
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
zhouxudong fb7176359b * Fix bug #11985. 2022-03-21 09:55:33 +08:00
zhouxudong a7516f1178 * Fix bug #11985. 2022-03-21 09:41:23 +08:00
王怡栋 371b7a7d7d Merge branch 'sprint/pailei2_tianshujie_17944' into 'pailei2'
* Fix bug #17944.

See merge request easycorp/zentaopms!2292
2022-03-16 05:04:22 +00:00
李玉春 2872292277 Merge branch 'pailei2_sunhuawei_50714' into 'pailei2'
*Fix bug#20452

See merge request easycorp/zentaopms!2253
2022-03-15 05:34:06 +00:00
tianshujie 2891ecc0ae * Fix bug #20781. 2022-03-15 11:29:51 +08:00
Zongjun Lan 5be25315f3 * fix bug #19535 2022-03-15 11:10:30 +08:00
tianshujie 0fde764778 * Fix bug #17944. 2022-03-15 10:27:27 +08:00
孙华伟 ad8f8f5336 *Fix bug#20452 2022-03-15 08:57:34 +08:00
李玉春 bb05dc2ffe Merge branch 'pailei2_sunhuawei_50714' into 'pailei2'
Pailei2 sunhuawei 50714

See merge request easycorp/zentaopms!2231
2022-03-14 08:17:05 +00:00
孙华伟 ffa6d43736 *Fix bug#20452 2022-03-14 16:10:35 +08:00
Zongjun Lan 3d936d7dc8 * fix bug #20703 2022-03-14 15:43:15 +08:00
孙华伟 6d3030063f * 2022-03-14 13:11:08 +08:00
zhouxin f9c4e15149 Fix bug #50416. 2022-03-14 02:09:18 +00:00
zhouxin f470e0d96b Fix bug #50416. 2022-03-11 06:58:47 +00:00
zhouxin 9f289a632a Fix bug 50416. 2022-03-11 06:45:03 +00:00
tianshujie 2e3438edfc * Modify the code. 2022-03-11 14:43:18 +08:00
tianshujie c353ff2b06 * Fix bug #20594. 2022-03-11 14:38:31 +08:00
tanghucheng 477e89a09e * Fix bug. 2022-03-11 14:03:30 +08:00
tianshujie ffd4850a9d * Finish task #20479. 2022-03-09 16:17:32 +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
孙广明 ebfdd2a742 Merge branch 'autoTest_liumengyi' into 'master'
* Add auto test for task.

See merge request easycorp/zentaopms!2159
2022-03-09 05:53:01 +00:00
liumengyi b1623bb73a * Add auto test for task. 2022-03-09 13:46:19 +08:00
mayue 9f38f5cd10 * Fix bug #50240. 2022-03-09 13:27:42 +08:00
xieqiyu 58d4a9ad37 * Modify review code. 2022-03-09 11:25:45 +08:00
xieqiyu 139ea1e04a * Modify review code. 2022-03-09 11:17:36 +08:00
zhangzilong 6327b37eae * Code for task #49888. 2022-03-09 10:41:46 +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
王怡栋 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
Zongjun Lan 64d797b109 * fix bug 50368 2022-03-08 15:49:39 +08:00
xieqiyu 944c0efdfe * Add selected lane when batch create in kanban. 2022-03-08 14:43:55 +08:00
李玉春 39d11cbedb Merge branch 'sprint/pailei2_zhouxudong_19990' into 'pailei2'
Sprint/pailei2 zhouxudong 19990

See merge request easycorp/zentaopms!2136
2022-03-08 03:29:32 +00:00
周旭东 c611670e8e Update en.php 2022-03-08 02:40:30 +00:00
周旭东 6b62b3f16d Update create.js 2022-03-08 02:37:53 +00:00
zhouxudong 49e06424d1 * Fix bug #19990. 2022-03-08 10:36:57 +08:00
zhouxudong ca901e8364 * Fix bug #19990. 2022-03-08 10:21:41 +08:00
孙华伟 03e3f26ad5 * 2022-03-08 10:03:06 +08:00
Zongjun Lan b82a7e5f57 * fix bug 50368 2022-03-08 09:51:34 +08:00
王怡栋 4778730e92 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-07 17:27:25 +08:00
王怡栋 b936dae827 * code for task #50359. 2022-03-07 17:26:33 +08:00
Zongjun Lan 3f9ca9c4fe * fix bug undefine lane 2022-03-07 17:18:31 +08:00
zhangzilong 45ad8dbf96 * Code for task #49888. 2022-03-07 13:07:52 +08:00
王怡栋 6a3af094fe Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug 20234,20022

See merge request easycorp/zentaopms!2072
2022-03-04 06:38:10 +00:00
Zongjun Lan a2e18288cf * fix bug 20022 2022-03-04 14:31:27 +08:00
Zongjun Lan 23d699311d * fix bug 20022 2022-03-04 14:27:25 +08:00
tianshujie 6dc0d7a70d * Solve the problem that the project field of the pending task list is 0. 2022-03-04 09:04:02 +08:00
Zongjun Lan 7312bfe658 * rollback code 2022-03-03 14:21:44 +08:00
Zongjun Lan cdf4b29e29 * fix bug 20030 2022-03-02 18:43:41 +08:00
Zongjun Lan f4970f502d * fix bug 20023 2022-03-01 16:34:34 +08:00