Commit Graph
3076 Commits
Author SHA1 Message Date
曹延义 1d195ca297 * Finish task #70095. 2022-09-22 15:14:22 +08:00
zhouxin 6ff8f6ba41 * Resolve feedback. 2022-09-20 17:24:37 +08:00
wangyidong 47a855e35f Merge branch 'sprint/wangyidong_bug' 2022-09-19 13:48:27 +08:00
王怡栋 fea946a6d0 Merge branch 'master_xieqiyu_27528' into 'master'
* Fix bug#27528.

See merge request easycorp/zentaopms!5384
2022-09-19 05:37:47 +00:00
王怡栋 0801b4a668 Merge branch 'master_liuhong_27183' into 'master'
Master liuhong 27183

See merge request easycorp/zentaopms!5388
2022-09-19 05:36:46 +00:00
liuhong 624c000f7d *Fix bug #27183 for newline when kanban create task. 2022-09-19 02:15:34 +00:00
xieqiyu 104787503b * Fix bug#27528. 2022-09-19 00:19:56 +00:00
wangyidong d6f395cc1b * fix bug #27012. 2022-09-16 15:00:21 +08:00
wangyidong a497bafb9f * fix bug. 2022-09-15 10:49:40 +08:00
wangyidong bb9aa91422 * adjust for finish page style. 2022-09-14 17:34:28 +08:00
wangyidong 7dbf59d067 * Ajax refresh view page when close effort modal. 2022-09-14 15:53:32 +08:00
wangyidong 8db145922d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-09-14 13:40:05 +08:00
wangyidong 2b75baa004 * fix bug #27472. 2022-09-14 13:39:40 +08:00
sunguangming 3b8b7d2681 * Add lang 'my' to task. 2022-09-14 08:57:53 +08:00
wangyidong 383bee843a * adjust for delete effort logic. 2022-09-13 17:22:13 +08:00
wangyidong 0e46ac4a91 * fix bug #27468. 2022-09-13 16:36:32 +08:00
wangyidong ee148d3a0e * fix bug #27447. 2022-09-13 15:29:55 +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 0142653d2b * adjust lang. 2022-09-13 13:21:14 +08:00
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 6c04f3fee3 * ajax reload for effort. 2022-09-13 08:41:50 +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