Commit Graph

498 Commits

Author SHA1 Message Date
liugang
c6fbb324bc Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-08-08 18:37:50 +08:00
liugang
5e68baf8c5 * Add function to get columns, statusMap, statusList, colorList of kanban. 2019-08-08 18:37:25 +08:00
wangyidong
7964ce412f * finish task #6190. 2019-08-07 15:27:39 +08:00
wangyidong
1364cd2f91 * finish task #6140. 2019-07-30 10:50:41 +08:00
Yagami
a8d37d279f * Finish task #6141. 2019-07-29 15:49:15 +08:00
wyd621
9143f4e38f Merge branch 'master' into 11.5 2019-07-12 15:55:04 +08:00
wangyidong
b884536307 * finish task #5990. 2019-07-09 11:08:21 +08:00
Yagami
1d3e3d11e7 * Finish task #5856. 2019-06-28 09:19:45 +08:00
Yagami
25380e6ff8 * Finish task #5859. 2019-06-27 15:59:17 +08:00
Yagami
e56cdbebae * Finish task #5811. 2019-06-19 15:58:03 +08:00
wangyidong
f43dc5c082 * adjust for bug. 2019-06-17 09:46:27 +08:00
wangyidong
a62b8fffcb * fix bug for get product and project. 2019-05-31 16:54:18 +08:00
yfl
d35eb8dfaf * Finsish task #5379,#5385,#5389,#5393,#5403,5409 2019-04-24 15:59:56 +08:00
wangyidong
24427df0df Merge branch 'master' of github.com:easysoft/zentaopms 2019-04-01 13:59:34 +08:00
wangyidong
4308ae4a70 * fix for update user view. 2019-04-01 13:57:58 +08:00
Yagami
8d06d00235 * Fix project warning. 2019-03-28 11:20:22 +08:00
wangyidong
bd0098ef08 Merge branch 'master' of github.com:easysoft/zentaopms 2019-03-27 13:52:40 +08:00
wangyidong
055340062f * adjust for print subMenu. 2019-03-27 13:51:04 +08:00
Yagami
81da2b6326 * Fix burn select condition. 2019-03-27 10:58:42 +08:00
chenfei
5e32a88966 * Finish task #5372. 2019-03-19 08:11:58 +08:00
chenfeiCF
296290f9c8 * Set acl default when create product or project. 2019-02-28 09:55:45 +08:00
wangyidong
8846db5269 * fix error. 2019-02-27 14:09:34 +08:00
wangyidong
178527100c * code for task #5271. 2019-02-25 11:26:51 +08:00
wangyidong
ab68c71dfb * fix bug. 2019-02-14 17:17:15 +08:00
wangyidong
cada6c243b * adjust for showDeleted custom. 2019-01-11 15:57:01 +08:00
wangyidong
7cafcbdabd * fix error for empty class and count task. 2019-01-03 13:51:08 +08:00
Yagami
ed0692a545 * Finish task #5194. 2019-01-02 10:08:12 +08:00
wangyidong
0e3ef4a715 * finish task #5185. 2018-12-29 14:24:31 +08:00
wangyidong
e576594489 * code for remove isdoing param. 2018-11-19 16:54:02 +08:00
Yagami
bff8f0161a * Finish task #5105. 2018-11-12 14:44:27 +08:00
Yagami
9dc991fc16 * Fix task module display. 2018-11-12 10:11:49 +08:00
Yagami
5cc4c04930 * Fix task search option. 2018-11-09 16:17:05 +08:00
wangyidong
cf167ce697 * adjust code for task. 2018-10-19 14:57:21 +08:00
wangyidong
e179c99ebc * finish task #4969. 2018-10-12 14:23:57 +08:00
滔哥
bd5d253791 * Finished task#4970. 2018-10-12 11:18:08 +08:00
滔哥
9f115f2a8e * Finished task#4968. 2018-10-11 21:33:57 +08:00
wangyidong
ef550c58fa * finish task #4943. 2018-09-27 11:19:03 +08:00
Catouse
e23a6e61d5 * code for task #4910. 2018-09-27 09:40:01 +08:00
Catouse
21c8c13db0 * finish task #4862. 2018-09-21 11:43:16 +08:00
wangyidong
d75be50cd7 * adjust for user view. 2018-09-17 11:30:31 +08:00
滔哥
83b6c68be4 * Finish task#4660 2018-09-11 17:43:46 +08:00
wangyidong
7b5878531b Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-10 15:25:06 +08:00
wangyidong
800a77fff6 * finish task #4764. 2018-09-10 15:23:59 +08:00
Yagami
eb780db5ab * Finish task #4762. 2018-09-10 09:53:34 +08:00
wangyidong
fbbb1b0d45 * fix bug for ajdust task time. 2018-08-24 11:33:46 +08:00
wangyidong
4875eec38e * finish task #4668. 2018-08-07 17:09:11 +08:00
wangyidong
3c897623e9 Merge branch 'master' of github.com:easysoft/zentaopms 2018-08-07 16:30:36 +08:00
wangyidong
1bcbddf649 * finish task #4659. 2018-08-07 16:30:00 +08:00
chenfeiCF
6264ffc4ce * Finish task #4645. 2018-08-07 16:24:49 +08:00
wangyidong
9e2df3dde2 * change for safe. 2018-07-23 17:27:54 +08:00