Commit Graph
3055 Commits
Author SHA1 Message Date
wangyidong 2ba29dd574 * adjust for effort when restart task. 2022-09-13 13:04:01 +08:00
wangyidong 070d0404b6 * fix bug for activate multi mode task. 2022-09-13 11:21:22 +08:00
wangyidong f743da3ddc * fix bug. 2022-09-13 11:04:04 +08:00
孙广明 65b1d28408 * Code for recordestimate view. 2022-09-13 10:55:29 +08:00
wangyidong d88700a2e7 * adjust for notice manage task team. 2022-09-13 10:35:56 +08:00
wangyidong 0881e39c54 * adjust for multi task. 2022-09-09 16:14:08 +08:00
王怡栋 b9564e50a1 Merge branch 'master_xieqiyu_27124' into 'master'
Master xieqiyu 27124

See merge request easycorp/zentaopms!5300
2022-09-09 07:17:43 +00:00
sunguangming abffa486a1 * Fix bug #27442. 2022-09-09 14:51:41 +08:00
tianshujie adb25f92b3 * Fix bug #27296. 2022-09-09 09:55:42 +08:00
wangyidong 1bb552b34d * fix bug for linear task. 2022-09-09 09:23:12 +08:00
xieqiyu ea1b08905c * Fix bug#27124. 2022-09-09 08:19:44 +08:00
王怡栋 0e71ec7d2a Merge branch 'sprint/237_tianshujie_bug' into 'master'
* Fix bug #24318.

See merge request easycorp/zentaopms!5294
2022-09-09 00:15:17 +00:00
wangyidong ce91c9945e * adjust for show linear effort. 2022-09-08 17:30:50 +08:00
wangyidong fdc9b93d82 * adjust for upgrade and holiday. 2022-09-08 16:08:03 +08:00
tianshujie 3304ee781b * Fix bug #24318. 2022-09-08 14:57:34 +08:00
xieqiyu 51e32c7179 * Modify lang of task. 2022-09-08 13:17:13 +08:00
王怡栋 28abbc2a71 Merge branch 'master_xieqiyu_67691' into 'master'
* Code for task#67691.

See merge request easycorp/zentaopms!5288
2022-09-08 03:15:45 +00: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
wangyidong c7c586691d * fix bug #27344. 2022-09-08 10:31:10 +08:00
wangyidong a195088ba3 * fix for edit team. 2022-09-08 10:07:45 +08:00
wangyidong 00b0aa0ba0 * adjust for create effort. 2022-09-08 09:47:56 +08:00
王怡栋 84da5dced1 Merge branch 'master' into 'master_xieqiyu_67691'
# Conflicts:
#   db/update17.6.sql
2022-09-08 01:38:22 +00:00
wangyidong 438c2b2524 * fix bug #27310. 2022-09-07 17:21:01 +08:00
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 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