Commit Graph
363 Commits
Author SHA1 Message Date
孙广明 55c79e0399 * Code for task #79664. 2022-12-13 15:20:09 +08:00
孙广明 81d54c790e * Finish task #79664. 2022-12-13 13:43:24 +08:00
lanzongjun edbf6b4307 * Fix Bug #30245 2022-11-25 10:37:19 +08:00
Yagami cac547b21a * Finish task #76948. 2022-11-21 15:11:44 +08:00
xieqiyu 864ed7a391 * Fix bug#29445. 2022-11-15 09:04:14 +08:00
mayue c92e9f119a * Finish task #75649. 2022-11-11 17:02:17 +08:00
zenggang fd5682fbdc * Fix bug #29460 2022-11-09 07:48:08 +00:00
liuhong ad6ee6377b * Resolved feedback #1302. 2022-11-02 05:51:09 +00:00
tianshujie faabb32285 * Optimize the style of maintaining multi-tasking teams. 2022-10-20 15:53:21 +08:00
曹延义 03e4c78c5f * Modify multi task activate. 2022-10-20 11:25:42 +08:00
曹延义 6943f825e1 Merge branch 'sprint/247' into sprint/cyy_72375 2022-10-20 08:57:55 +08:00
曹延义 fc99bbfd05 * Finish task #72375. 2022-10-20 08:54:27 +08:00
曹延义 1b80975ac1 * Code for task #72375. 2022-10-19 17:21:35 +08:00
孙广明 020fada011 Merge branch 'sprint/247_tianshujie_72347' into 'sprint/247'
* Finish task #72347.

See merge request easycorp/zentaopms!5800
2022-10-19 09:04:21 +00:00
tianshujie 8b2477b734 * Finish task #72347. 2022-10-19 13:46:18 +08:00
tianshujie 8bbf77788a * Finish task #72348. 2022-10-18 14:34:29 +08:00
tianshujie 8c85776666 * Finish task #72348. 2022-10-18 09:28:51 +08:00
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