Commit Graph
16648 Commits
Author SHA1 Message Date
guanxiying fc7e7dc697 * Remove unused code. 2019-11-26 15:25:59 +08:00
guanxiying 0c2dd8d390 * Add flow.js. 2019-11-26 15:18:55 +08:00
Yagami ef5afcf3b4 * Finish task #6585. 2019-11-26 14:34:12 +08:00
Yagami 0509d13b96 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-26 14:31:37 +08:00
Yagami 9358057416 * Finish task #6492. 2019-11-26 14:31:22 +08:00
guanxiying fd51e64f48 Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-26 14:14:44 +08:00
guanxiying dfed1526d6 * Finish task 6569. 2019-11-26 14:14:18 +08:00
guanxiying 9a74ca9c40 * Finish task 6569. 2019-11-26 14:13:45 +08:00
wangyidong 41c510df8d * code for task #6584. 2019-11-26 14:06:19 +08:00
wangyidong 4c1bb0f6a8 * finish task #6584. 2019-11-26 13:51:21 +08:00
wangyidong 4988680449 * finish task #6577. 2019-11-26 13:49:20 +08:00
guanxiying 8b755da228 * Finish task #6571. 2019-11-26 13:35:09 +08:00
wangyidong 01714d62e6 * finish task #6573. 2019-11-26 13:23:23 +08:00
wangyidong 7c3655d11d * adjust code. 2019-11-26 11:30:03 +08:00
wangyidong 345a01ff15 * finish task #6583. 2019-11-26 11:17:13 +08:00
wangyidong 06d232c4ae Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-26 11:05:10 +08:00
wangyidong eaba6528f1 * finish task #6598. 2019-11-26 11:04:47 +08:00
wangyidong fff27470c1 * adjust code. 2019-11-26 11:04:33 +08:00
wangyidong 90122b67b9 * adjust code. 2019-11-26 11:03:45 +08:00
Yagami d98082f597 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-26 10:45:11 +08:00
Yagami 994823a24c * Code for task #6484. 2019-11-26 10:44:43 +08:00
guanxiying 6976079958 Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-26 10:12:05 +08:00
wangyidong c76de78022 * finish task #6593. 2019-11-26 10:10:24 +08:00
wangyidong f55e28a6fd * finish task #6592. 2019-11-26 10:09:51 +08:00
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 cbf2352e68 Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-26 09:29:07 +08:00
Catouse 33c26a81b8 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-26 09:28:29 +08:00
Catouse cadc64c628 * fix chosen style in input-group. 2019-11-26 09:28:22 +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
guanxiying 3dacf7d80e * Add acl index of product and project table. 2019-11-26 08:44:47 +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
wangyidong 4345cf5451 Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-25 08:43:19 +08:00
wangyidong da02886078 * adjust update sql. 2019-11-25 08:41:59 +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
wangyidong 55c64d9efa Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-22 15:40:26 +08:00
wangyidong 21b36247ff * code for setConcept. 2019-11-22 15:39:44 +08:00
Catouse 294082c425 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-22 15:35:34 +08:00
Catouse 1bbb21bd11 * fix scrollInside option not work as expectly in ie11. 2019-11-22 15:34:48 +08:00
guanxiying 1f26dce25e Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-22 14:45:56 +08:00