Commit Graph
16585 Commits
Author SHA1 Message Date
guanxiying e4d0ca4ff6 * Fix bug 2790. 2019-11-21 17:15:18 +08:00
wangyidong 2d500ae75c * code for task #6566. 2019-11-21 16:49:08 +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
Catouse 8833851bee Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-21 16:15:49 +08:00
Catouse f98ea2c6de * upgrade jquery to 3.4.1, task #6533, bug #2755, task #6528, bug #2787. 2019-11-21 16:15:44 +08:00
wangyidong ebf78655dc * fix error. 2019-11-21 16:03:39 +08:00
wangyidong 5ce0a2ca78 * code for task #6566. 2019-11-21 16:02:44 +08:00
guanxiying 0f74d12896 * Revert httponly param when set lang and theme cookie. 2019-11-21 15:41:41 +08:00
Catouse 4cba83d9ed * update zui.js, disabled fixHeader and fixFooter option in ie11 in table. 2019-11-21 15:20:42 +08:00
Catouse b374a515a1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-21 15:19:23 +08:00
Catouse 4b53a604b8 * task #6530, bug #2782. 2019-11-21 15:19:18 +08:00
guanxiying 62c2d8cb9d * Add ini_set session.cookie_httponly. 2019-11-21 14:33:07 +08:00
guanxiying 5aa701c747 Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-21 14:23:06 +08:00
Catouse 624cd00335 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-21 14:22:30 +08:00
Catouse 7734d23fea * fix border of input-group controls in task/create view. 2019-11-21 14:22:10 +08:00
guanxiying adcd079064 Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-21 14:21:08 +08:00
wangyidong 79271a23db Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-21 14:20:52 +08:00
guanxiying bad6bbd39c * Add httpOnly param when setcooki. 2019-11-21 14:20:11 +08:00
Catouse 827db2d03f * task #6525, bug #2791. 2019-11-21 14:19:33 +08:00
wangyidong 861ec58fcb * code for task #6566. 2019-11-21 14:17:52 +08:00
Catouse 60f0192d57 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-21 14:03:32 +08:00
Catouse e572742f27 * task #6501, bug #2819. 2019-11-21 14:03:07 +08:00
reneeteng 9e46b973ad Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-21 14:01:21 +08:00
reneeteng 5888e67b28 * Dingding lang updated. 2019-11-21 14:00:16 +08:00
wangyidong 79155cd834 Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-21 13:59:51 +08:00
wangyidong c0ab373ce7 * code for task #6566. 2019-11-21 13:57:49 +08:00
reneeteng 742510a708 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-21 13:52:48 +08:00
Yagami abab3bb475 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-21 13:50:40 +08:00
Yagami 6a0af253dc * Fix task #6489. 2019-11-21 13:50:01 +08:00
guanxiying 27e470b249 Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-21 13:35:12 +08:00
Catouse e29bf8e2e9 * task #6498, bug #2826. 2019-11-21 13:34:34 +08:00
guanxiying aa22a31176 * Use projectCommon. 2019-11-21 13:32:27 +08:00
guanxiying 4e481bed19 * Add httpOnly param when setcookie. 2019-11-21 13:31:35 +08:00
guanxiying 230dcd7dd7 * Setcookie with httpOnly param. 2019-11-21 13:30:49 +08:00
Catouse cba8bc5b32 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-21 13:22:19 +08:00
Catouse deea96e652 * task #6514, bug #2804. 2019-11-21 13:22:10 +08:00
wangyidong 485fdde5e0 Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-21 13:16:41 +08:00
Yagami 7166433796 * Fix task #6489. 2019-11-21 13:15:08 +08:00
wangyidong 006513e56f * finish task #6566. 2019-11-21 13:15:06 +08:00
Yagami 8793027662 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-21 11:12:28 +08:00
Yagami 3945b01696 * Fix js error. 2019-11-21 11:12:05 +08:00
guanxiying 274be9c592 * Fix story type typeList of todo. 2019-11-21 11:07:16 +08:00
guanxiying 9720ffcf60 * Create index.html to every folder. 2019-11-21 10:06:57 +08:00
Yagami 26a5faf5cd Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-21 09:13:53 +08:00
Yagami 97a65c43a7 * Finish task #6489. 2019-11-21 09:13:31 +08:00
guanxiying 84b7c6caf5 * Add call of fix bug type list functon. 2019-11-20 17:23:39 +08:00
guanxiying 3c5c094b9f * Fix style when concept not setted. 2019-11-20 17:10:19 +08:00
guanxiying e899334745 * Highlight concept menu. 2019-11-20 16:59:49 +08:00
guanxiying 4c9b1d2d4d * Fix style of concept page. 2019-11-20 16:59:23 +08:00