Commit Graph
514 Commits
Author SHA1 Message Date
caoyanyi f58e24e6fc Merge branch 'master' into zenops_46 2022-12-02 10:04:48 +08:00
wangyidong b2f9f3460b * fix bug #29637. 2022-11-30 16:19:15 +08:00
caoyanyi 90331724dc Merge branch 'master' into zenops_46 2022-11-07 14:00:34 +08:00
liyuchun 00547dc0f5 Merge branch 'master' into zenops_46 2022-10-24 09:18:10 +08:00
曹延义 6943f825e1 Merge branch 'sprint/247' into sprint/cyy_72375 2022-10-20 08:57:55 +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 86929e218d * Finish task #72348. 2022-10-18 09:21:07 +08:00
曹延义 29f8aad222 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_tianshujie_70498 2022-10-10 16:56:50 +08:00
tianshujie 6c39ac6ba5 * Finish task #71899. 2022-10-10 09:49:54 +08:00
tianshujie e8757d4692 * Finish task #70498. 2022-09-29 14:51:52 +08:00
liyuchun 6bed7509e7 Merge branch 'master' into zenops_46 2022-09-29 09:25:12 +08:00
tianshujie a6cd4e549c * Finish task #70094. 2022-09-22 18:13:50 +08:00
liyuchun bf10b415df Merge branch 'zenops_44' into zenops_46 2022-09-20 08:33:44 +08:00
sunguangming 3b8b7d2681 * Add lang 'my' to task. 2022-09-14 08:57:53 +08:00
wangyidong 0142653d2b * adjust lang. 2022-09-13 13:21:14 +08:00
wangyidong 070d0404b6 * fix bug for activate multi mode task. 2022-09-13 11:21:22 +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
曹延义 d5fa809755 Merge branch 'master' into zenops_44 2022-09-09 10:59:26 +08: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
xieqiyu 51e32c7179 * Modify lang of task. 2022-09-08 13:17:13 +08:00
曹延义 2014a4b0ba Merge branch 'master' into zenops_44 2022-09-07 06:51:46 +00: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
liumengyi 5d121bbc01 * Fix bug #25695. 2022-09-05 13:12:36 +08:00
wangyidong 86ebfc0480 * fix bug #27262. 2022-09-05 11:30:25 +08:00
liyuchun 5f04a8d798 Merge branch 'master' into zenops_44 2022-09-05 09:29:53 +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
wangyidong 39ce15c672 * fix bug #27092. 2022-08-31 16:11:54 +08:00
sunguangming 5463a7e62c * merge code. 2022-08-31 14:06:04 +08:00
liyuchun d9642d657f * Finish task #65984. 2022-08-30 16:58:48 +08:00
liyuchun 82996a13de * Reduction code. 2022-08-29 16:11:00 +08:00
liyuchun 088c55f390 * Add history log. 2022-08-29 16:09:22 +08:00
sunguangming a27dc9a3f2 * Code for mulit task. 2022-08-26 14:33:50 +08:00
liyuchun 33e0de2cdc Merge branch 'zenops_44' into liyuchun_65983 2022-08-26 14:28:47 +08:00
liyuchun 61c88f627c * Finish task #65979,65978,65977. 2022-08-26 14:06:01 +08:00
wangyidong fcc537bacc * code for task #65286. 2022-08-23 17:26:04 +08:00
liumengyi 6f187e3a23 * Correct the translation. 2022-08-23 17:16:49 +08:00
wangyidong ae326809cc * adjust for start, assignto, finish task in linear task. 2022-08-17 21:15:36 +08:00
liuyongkai dafa228a04 * Fix bug #25690 2022-08-08 08:57:42 +00:00
liuyongkai 327336b7bf * Fix bug 25690. 2022-08-08 05:59:13 +00:00
lanzongjun 8adc70569f fix 2022-08-05 14:21:04 +08:00
lanzongjun f47ab8a359 * finish task #62889 2022-08-02 17:18:24 +08:00
hufangzhou 9bfb42cffd * Add the new version. 2022-07-27 15:01:41 +08:00
liuhong e858799e11 *Fix bug #24666 2022-07-21 04:23:38 +00:00
liuhong 25a0350108 * Fix bug#24666. 2022-07-21 04:20:57 +00:00
sunjun 1404449da1 sprint/211_sunjun_60474 2022-07-11 09:09:29 +00:00