Commit Graph

517 Commits

Author SHA1 Message Date
wangyidong
ef36818cad * fix sql error. 2019-12-04 16:33:31 +08:00
wangyidong
09a7bb1136 * fix bug #2884. 2019-12-03 09:57:35 +08:00
guanxiying
e7df75ce8a * Set httponly false to projectMode cookie. 2019-11-26 17:29:46 +08:00
wangyidong
c0e0423c09 Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-21 16:20:45 +08:00
wangyidong
b93dd94b05 * code for task #6548. 2019-11-21 16:19:59 +08:00
guanxiying
bad6bbd39c * Add httpOnly param when setcooki. 2019-11-21 14:20:11 +08:00
Yagami
66323f8833 * Finish task #6547. 2019-11-20 16:06:55 +08:00
guanxiying
8e66e7efab Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-19 15:14:05 +08:00
guanxiying
39be2ba90e * Fix bug #2812. 2019-11-19 15:13:18 +08:00
Yagami
99e6b82715 * Finish task #6524. 2019-11-19 14:29:50 +08:00
guanxiying
c43211716c * Remove deleted users from team. 2019-11-18 16:56:10 +08:00
Yagami
26be63f937 * Finish code form #6408. 2019-10-17 10:03:31 +08:00
Yagami
908d70ef34 * Finish task #6452. 2019-10-12 11:08:39 +08:00
Yagami
19e5590541 * Finish task #6408. 2019-10-11 16:26:46 +08:00
wangyidong
8ebd5c0d64 * fix bug #2757. 2019-09-20 15:25:51 +08:00
wangyidong
c16eeefa33 * replace ne() function to notIN(). 2019-09-05 16:00:04 +08:00
Yagami
3fee807700 * Finish task #6302. 2019-09-02 16:45:34 +08:00
Yagami
6fc9c4b30d * Fix task #6323. 2019-09-02 10:24:23 +08:00
Yagami
83fcc6b265 * Finish task #6323. 2019-09-02 09:40:28 +08:00
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