Commit Graph
3282 Commits
Author SHA1 Message Date
wangyidong a370daf00f * fix bug #27307. 2022-09-07 17:16:30 +08:00
xieqiyu 80ff723165 * Code for task#67691. 2022-09-07 16:58:54 +08:00
wangyidong aa9e733921 * fix bug #27286. 2022-09-07 09:20:26 +08:00
xieqiyu 9dedf90d27 * Fix bug#27276,#27280. 2022-09-06 14:20:39 +08:00
sunguangming 6e6f1b0800 * Alter recordestimate view to 5 lines. 2022-09-06 11:08:28 +08:00
wangyidong 19a69c8cae * code for task #67405. 2022-09-06 09:30:22 +08:00
孙广明 a321b87f1c Merge branch 'sprint/237_liumengyi_fixbug' into 'master'
* Fix bug #26298, #25695, #27192, #25409, #27020, #23401.

See merge request easycorp/zentaopms!5262
2022-09-06 00:42:27 +00:00
wangyidong 6972110d54 * adjust for delete estimate. 2022-09-05 20:21:18 +08:00
liumengyi b0a7a8bfd7 * Modify css for task #67925. 2022-09-05 14:07:51 +08:00
wangyidong c8c544c6d0 * adjust for record estimate. 2022-09-05 13:55:22 +08:00
wangyidong 4f170236c3 * fix bug #27262. 2022-09-05 13:33:56 +08:00
sunguangming 2f3e8d91ae * Adjust recordestimate style. 2022-09-05 13:20:19 +08:00
liumengyi 0399d05c95 * Fix bug #27192. 2022-09-05 13:12:58 +08:00
liumengyi 5d121bbc01 * Fix bug #25695. 2022-09-05 13:12:36 +08:00
王怡栋 88a75824f7 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #27198

See merge request easycorp/zentaopms!5251
2022-09-05 05:05:12 +00:00
wangyidong 86ebfc0480 * fix bug #27262. 2022-09-05 11:30:25 +08:00
lanzongjun f7922c8c70 * fix bug #27198 2022-09-05 11:03:26 +08:00
sunguangming bd80adb658 * Code for recordestimate style. 2022-09-05 09:19:10 +08:00
wangyidong 574fd06e71 * adjust for task #67404. 2022-09-05 08:36:17 +08:00
wangyidong 4635256fb9 * adjust for record estimate for linear task. 2022-09-02 17:51:04 +08:00
wangyidong c94a577c96 * adjust for task #67404. 2022-09-02 16:20:15 +08:00
王怡栋 f1ce6c51a6 Merge branch 'estimate2effort' into 'master'
* Merge task estimate to effort.

See merge request easycorp/zentaopms!5254
2022-09-02 06:28:06 +00:00
sunguangming d5ee1ab4f3 * Merge task estimate to effort. 2022-09-02 13:52:56 +08:00
lanzongjun 5ad5882e9b resolve conflict 2022-09-02 13:20:42 +08:00
lanzongjun 91da8c65f6 remove feedback action 2022-09-02 13:17:27 +08:00
王怡栋 1a9ba95c43 Merge branch 'master_xieqiyu_66955' into 'master'
* Code for task#66955.

See merge request easycorp/zentaopms!5245
2022-09-02 05:07:46 +00:00
wangyidong d1cb72d4a2 * code for task #67405. 2022-09-02 10:49:29 +08:00
xieqiyu 62e9b5aa44 * Code for task#66955. 2022-09-02 09:44:14 +08:00
wangyidong 5fe9412a2e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-09-01 14:30:56 +08:00
wangyidong db217f9ffe * fix bug #27056. 2022-09-01 14:30:18 +08:00
王怡栋 e1b02d65f8 Merge branch 'sprint/235_tianshujie_bug' into 'master'
Sprint/235 tianshujie bug

See merge request easycorp/zentaopms!5238
2022-09-01 05:45:30 +00:00
wangyidong e7d65e1dce Merge branch 'sprint/zentaopms230' 2022-09-01 13:28:26 +08:00
tianshujie f0ab716d29 * Fix bug #25848. 2022-09-01 13:22:52 +08:00
孙广明 da43a0c083 Merge branch '230' into 'sprint/zentaopms230'
* Fix bug #27110.

See merge request easycorp/zentaopms!5235
2022-09-01 05:17:18 +00:00
sunguangming 09a0f1c420 * Fix bug #27110. 2022-09-01 13:16:38 +08:00
孙广明 7473080790 Merge branch '230' into 'sprint/zentaopms230'
* Finish taks #67403

See merge request easycorp/zentaopms!5234
2022-09-01 05:12:58 +00:00
liuyongkai 29c53164b3 * Finish task #67403. 2022-09-01 05:11:55 +00:00
wangyidong 2b237ea8e3 * fix bug for assignTo for linea task. 2022-09-01 11:23:12 +08:00
王怡栋 58c0d43da5 Merge branch 'master_xieqiyu_66955' into 'master'
Master xieqiyu 66955

See merge request easycorp/zentaopms!5219
2022-09-01 03:05:12 +00:00
xieqiyu 16094e64d4 * Optimize code. 2022-09-01 11:04:08 +08:00
xieqiyu d552aa67f9 * Code for task#66955. 2022-09-01 10:47:58 +08:00
wangyidong 81197fe961 * fix bug #26744 2022-09-01 10:20:53 +08:00
王怡栋 ef84a5fb9a Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* finish task #66992

See merge request easycorp/zentaopms!5224
2022-09-01 02:16:40 +00:00
王怡栋 e4b0527659 Merge branch 'master_liuhong_66217' into 'master'
*Finish task #66217,66218,66210 Fix bug 26687,26632,26622,26619.

See merge request easycorp/zentaopms!5193
2022-09-01 01:59:33 +00:00
lanzongjun 07c97f4072 modify processed 2022-09-01 09:40:57 +08:00
liuyongkai fbd3f09a3d * Finish task 65047. 2022-09-01 01:38:38 +00:00
lanzongjun 71cd04f05d modify processed 2022-09-01 09:37:59 +08:00
lanzongjun 11ace1e2da Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-09-01 09:11:23 +08:00
liuhong 2a93c8cff5 *Fix bug #66217. 2022-09-01 01:11:22 +00:00
lanzongjun 1a65713332 * finish task #66992 2022-09-01 09:11:10 +08:00