Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
45,875 Commits 2 Branches 292 Tags
bd13e39ade4db720e730a16d5bbd3735701d09b6
Commit Graph
1156 Commits
Author SHA1 Message Date
tianshujie 80f9e9ab61 * Fix bug #28499. 2022-10-19 15:34:54 +08:00
wangyidong 91ae21caec Merge branch 'master' into sprint/feedback_module 2022-10-11 09:33:25 +08:00
tianshujie e9ebed5a6e * Finish task #71904. 2022-10-10 11:28:31 +08:00
liuyongkai 6422b24d96 * Resolve feedback #938. 2022-10-08 01:40:04 +00:00
wangyidong fd1c722af1 * fix bug #28075. 2022-09-30 14:58:57 +08:00
孙广明 9c5e3353e6 Merge branch 'lyk_27556' into 'master' 
* Fix bug #27556.

See merge request easycorp/zentaopms!5615
 2022-09-29 06:43:24 +00:00
liuyongkai 11448f3cee * Fix bug #27556. 2022-09-29 06:39:47 +00:00
liuyongkai 2b815f88c1 * Fix bug #27556. 2022-09-29 06:09:50 +00:00
王怡栋 fe8d365582 Merge branch 'master_27982' into 'master' 
Master 27982

See merge request easycorp/zentaopms!5602
 2022-09-29 05:50:26 +00:00
liuhong 46fb56826d *adjust code. 2022-09-28 14:00:58 +00:00
liuhong 491227bfaa *Adjust code for ditto format. 2022-09-28 13:53:45 +00:00
liuhong 419e054101 *Fix bug #27982 and Adjust code. 2022-09-28 07:38:07 +00:00
tianshujie 4778db197d * Finish task #70017. 2022-09-28 13:39:06 +08:00
sunguangming ac8f6c9413 * Code for task effort bug. 2022-09-26 14:50:04 +08:00
tianshujie a20a8b6cdf * Fix bug #27871. 2022-09-23 13:49:57 +08:00
曹延义 5667c2cade * Fix bug #27854. 2022-09-23 11:22:36 +08:00
tianshujie 6f599fad75 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/241_tianshujie_70008 2022-09-23 10:26:29 +08:00
tianshujie 6a7c69e14e * Finish task #70008. 2022-09-23 10:22:32 +08:00
tianshujie a6cd4e549c * Finish task #70094. 2022-09-22 18:13:50 +08:00
tianshujie 073c3fc987 * Finish task #70008. 2022-09-22 10:27:55 +08:00
tianshujie a8bdc9bc6c * Finish task #70008. 2022-09-22 09:07:11 +08:00
wangyidong a497bafb9f * fix bug. 2022-09-15 10:49:40 +08:00
wangyidong 0e46ac4a91 * fix bug #27468. 2022-09-13 16:36:32 +08:00
wangyidong 3dc0abf2d1 * adjust for check effort consumed. 2022-09-13 13:58:13 +08:00
wangyidong 09694f3751 * adjust for edit effort. 2022-09-13 13:37:13 +08:00
wangyidong 2ba29dd574 * adjust for effort when restart task. 2022-09-13 13:04:01 +08:00
wangyidong f743da3ddc * fix bug. 2022-09-13 11:04:04 +08:00
wangyidong 0881e39c54 * adjust for multi task. 2022-09-09 16:14:08 +08:00
lanzongjun e0bb42fac5 resolve conflict 2022-09-08 11:18:09 +08:00
xieqiyu 5c3ff64ce7 * Code for task#67691. 2022-09-08 11:14:53 +08:00
xieqiyu 97b4bb9487 * Code for task#67691. 2022-09-08 11:03:44 +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
孙广明 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
wangyidong 4f170236c3 * fix bug #27262. 2022-09-05 13:33:56 +08:00
liumengyi 0399d05c95 * Fix bug #27192. 2022-09-05 13:12:58 +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
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
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
wangyidong d1cb72d4a2 * code for task #67405. 2022-09-02 10:49:29 +08:00
wangyidong db217f9ffe * fix bug #27056. 2022-09-01 14:30:18 +08:00
wangyidong e7d65e1dce Merge branch 'sprint/zentaopms230' 2022-09-01 13:28:26 +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