Commit Graph
13709 Commits
Author SHA1 Message Date
guanxiying d260de3949 * Finish task #6572. 2019-11-26 10:05:08 +08:00
guanxiying 57d676b821 Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-26 09:37:08 +08:00
wangyidong 143310de0c Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-26 09:36:17 +08:00
wangyidong 0763c4288d * finish task #6567. 2019-11-26 09:35:27 +08:00
guanxiying 0ec359908e * Finish task #6578. 2019-11-26 09:22:01 +08:00
guanxiying 685235c1e7 * Finish task #6581. 2019-11-26 09:20:26 +08:00
guanxiying cffb3761ba * Use " inatead of ' to quote storyCommon. 2019-11-26 09:11:10 +08:00
guanxiying 1385c7163e * Use processStatus show testtask status. 2019-11-26 09:04:02 +08:00
guanxiying 37d0e1d89a * Add distinct to bug type query sql. 2019-11-26 08:47:12 +08:00
Catouse 1188868ab8 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-25 16:38:11 +08:00
Catouse 5b02546da1 Revert "* upgrade jquery to 3.4.1, task #6533, bug #2755, task #6528, bug #2787."
This reverts commit f98ea2c6de.

# Conflicts:
#	www/js/jquery/lib.js
2019-11-25 16:37:57 +08:00
wangyidong 515adc12c8 * change for method name. 2019-11-25 09:39:27 +08:00
guanxiying 1f26dce25e Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-22 14:45:56 +08:00
wangyidong 74cf15f548 Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-22 17:01:04 +08:00
wangyidong 303b48c1bb * code for bind dinguserid. 2019-11-22 17:00:02 +08:00
wangyidong 18a4c9220f * adjust for getTaskOptionMenu method. 2019-11-22 16:59:07 +08:00
guanxiying 0665deed72 * Adjust type and endList of sprint. 2019-11-22 14:45:33 +08:00
guanxiying 678487a9da * Fix ajax post of concept form. 2019-11-22 13:59:38 +08:00
guanxiying 35e0053b97 * Fix selected of hour and story point. 2019-11-22 13:55:44 +08:00
guanxiying a1ebb34bb5 * Fix quote of storyCommon. 2019-11-22 13:50:54 +08:00
Yagami 5cfb8cc8d8 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-22 13:10:19 +08:00
Yagami f207e3e12d * Finish task #6495. 2019-11-22 13:09:44 +08:00
wangyidong 35aa95d49e Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-22 11:10:50 +08:00
wangyidong 0ad697012f * set concept setted in upgrade. 2019-11-22 11:10:09 +08:00
Catouse 723b36f2e7 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-22 11:07:01 +08:00
Catouse cfeda25b43 * task #6513, bug #2805. 2019-11-22 11:06:48 +08:00
wangyidong 41c693d07a * finish task #6488. 2019-11-22 10:37:50 +08:00
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 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
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 5aa701c747 Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-21 14:23:06 +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
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
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
guanxiying aa22a31176 * Use projectCommon. 2019-11-21 13:32:27 +08:00
guanxiying 230dcd7dd7 * Setcookie with httpOnly param. 2019-11-21 13:30:49 +08:00