Commit Graph
346 Commits
Author SHA1 Message Date
tianshujie bafc9a6020 * Fix bug #28528. 2022-10-17 13:54:11 +08: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 66e1043907 *adjust code. 2022-09-28 13:59:11 +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
曹延义 0911d16112 * Code for task #70495. 2022-09-27 09:59:14 +08:00
曹延义 8ce8855258 * Modify edit multi task. 2022-09-23 11:52:00 +08:00
王怡栋 16d1f76ca0 Merge branch 'sprint/cyy_optimize' into 'master'
* Optimize record estimate style.

See merge request easycorp/zentaopms!5499
2022-09-23 02:04:15 +00:00
曹延义 a02d6c751e * Optimize record style. 2022-09-23 09:46:31 +08:00
tianshujie 6fd346708e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/241_tianshujie_task 2022-09-23 08:08:42 +08:00
tianshujie 500078a229 * Finish task #70096. 2022-09-22 17:31:40 +08:00
曹延义 1d195ca297 * Finish task #70095. 2022-09-22 15:14:22 +08:00
wangyidong 47a855e35f Merge branch 'sprint/wangyidong_bug' 2022-09-19 13:48:27 +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 ee148d3a0e * fix bug #27447. 2022-09-13 15:29:55 +08:00
wangyidong 070d0404b6 * fix bug for activate multi mode task. 2022-09-13 11:21:22 +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
tianshujie adb25f92b3 * Fix bug #27296. 2022-09-09 09:55:42 +08:00
wangyidong a195088ba3 * fix for edit team. 2022-09-08 10:07:45 +08:00
wangyidong c94a577c96 * adjust for task #67404. 2022-09-02 16:20:15 +08:00
wangyidong e7d65e1dce Merge branch 'sprint/zentaopms230' 2022-09-01 13:28:26 +08:00
liuhong 2a93c8cff5 *Fix bug #66217. 2022-09-01 01:11:22 +00:00
liuhong 4aff831a07 *Fix bug #66217. 2022-08-31 11:20:09 +00:00
liuhong 18d6ed7f2d *Fix bug #66217. 2022-08-31 06:13:31 +00:00
wangyidong 49700f4923 * fix bug #27016. 2022-08-31 11:20:31 +08:00
liuhong 3dfd3ecfca *Finish task #66217,66218,66210 Fix bug 26687,26632,26622,26619. 2022-08-30 04:08:38 +00:00
王怡栋 3eaf146f25 Merge branch 'sprint/zentaopms230' into '230'
# Conflicts:
#   module/task/model.php
2022-08-26 06:52:24 +00:00
wangyidong 3a5f4201ed * adjust for multi task. 2022-08-26 14:50:48 +08:00
sunguangming a27dc9a3f2 * Code for mulit task. 2022-08-26 14:33:50 +08:00
wangyidong 1ac7743874 * fix for change task mode. 2022-08-24 23:19:19 +08:00
wangyidong c0467f2b7d * adjust for activate task. 2022-08-24 22:20:54 +08:00
wangyidong 19a2ef4ac8 * fix bug #26741. 2022-08-22 16:58:47 +08:00
wangyidong 8ac2f02a8e * code for task #65270. 2022-08-22 10:11:17 +08:00
zhouxudong c42f97c564 * Optimization task #64884. 2022-08-19 06:04:44 +00:00
wangyidong 426423881e * code for task #65270. 2022-08-18 12:33:18 +08:00
wangyidong 6d987182a8 * change for multi task teams. 2022-08-17 16:01:41 +08:00
wangyidong aa4fd1de10 * adjust for linear task. 2022-08-17 13:07:33 +08:00
wangyidong 95ef309921 * code for task #65279. 2022-08-16 13:39:25 +08:00
tianshujie c34c0276b2 * Finish task #63692. 2022-08-09 16:18:18 +08:00
tianshujie 3cb3c5956f * Finish task #63692. 2022-08-09 16:11:20 +08:00
tianshujie 1200e97722 * Finish task #63692. 2022-08-09 15:19:16 +08:00
liumengyi 3dc8d9c097 * Fix issue #710. 2022-08-05 10:18:43 +08:00
liumengyi 96c59fdf52 * Fix bug #24337. 2022-07-21 10:22:00 +08:00
liumengyi 72ed2599d1 * Fix bug #25230. 2022-07-21 09:22:20 +08:00
孙广明 cb01084a13 Merge branch 'sprint/215_liumengyi_25230' into 'master'
* Fix bug #25230, #25200,#24929.

See merge request easycorp/zentaopms!4579
2022-07-15 06:17:32 +00:00
孙广明 900e2342a2 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4582
2022-07-15 06:16:50 +00:00
tianshujie 656cc5f060 * Fix bug #25321. 2022-07-15 14:07:32 +08:00
liumengyi 7b9c5e6d52 * Fix bug #25230. 2022-07-15 13:42:13 +08:00