Commit Graph

59 Commits

Author SHA1 Message Date
曹延义
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
tianshujie
a6cd4e549c * Finish task #70094. 2022-09-22 18:13:50 +08:00
sunguangming
3b8b7d2681 * Add lang 'my' to task. 2022-09-14 08:57:53 +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
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
孙广明
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
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
sunguangming
a27dc9a3f2 * Code for mulit task. 2022-08-26 14:33:50 +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
lanzongjun
8adc70569f fix 2022-08-05 14:21:04 +08:00
lanzongjun
f47ab8a359 * finish task #62889 2022-08-02 17:18:24 +08: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
liumengyi
89f5ead39c * Modify French language items. 2022-07-04 11:28:49 +08:00
liumengyi
7f9f5f662c * Finish task #59468. 2022-07-04 11:21:56 +08:00
tianshujie
7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
孙广明
b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明
b528156589 * Change license. 2022-06-08 09:34:46 +08:00
tianshujie
e3d1c44eae * Finish task #55257. 2022-05-25 13:45:10 +08:00
tianshujie
aecf12e083 * Finish task #42415. 2021-09-08 13:51:43 +08:00
tianshujie98
a072ee2b7f * Finish task #41735. 2021-08-23 16:04:37 +08:00
qiyu-xie
11ac174b15 * Finish task#41766. 2021-08-20 13:12:43 +08:00
holan20180123
a41e43311a * Distinguish project execution from task module. 2021-03-05 09:35:40 +08:00
tianshujie98
c969d44561 * Fix the bug sorting of tasks on my module. 2020-12-29 14:10:36 +08:00
Yagami
66747a8069 * Rename project common to execution common. 2020-12-18 10:04:30 +08:00
leiyong
ea3300acf4 * Replace ->planCommon. 2020-12-17 17:20:12 +08:00
tianshujie98
0a7f82bc45 * Finish task #8087. 2020-09-30 14:16:08 +08:00
tianshujie98
32444c9564 * Finish task #7990. 2020-09-18 13:11:14 +08:00
Yagami
b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
qiyu-xie
dd49d9e613 * Add task module lang. 2020-08-26 10:34:58 +08:00
qiyu-xie
1a9df49057 * Add task module lang. 2020-08-26 10:14:41 +08:00
qiyu-xie
4170ad49b5 Fix bug #2582 2020-08-17 08:59:45 +08:00
holan20180123
29a2c25ef1 * Fix bug #3334. 2020-08-12 08:15:40 +08:00
holan20180123
afdf88d276 * Fix bug #3340. 2020-08-10 17:33:42 +08:00
qiyu-xie
76381c1fd2 * Merge. 2020-08-05 11:16:37 +08:00