Commit Graph
14047 Commits
Author SHA1 Message Date
Yagami 669aa803ae Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-14 10:47:36 +08:00
Yagami d4d9cef1df * Fix testsuite createcase view. 2018-11-14 10:47:00 +08:00
wangyidong c487cbcf9b Merge branch 'master' of github.com:easysoft/zentaopms 2018-11-14 09:25:00 +08:00
wangyidong 80f3dca2ad * finish task #5066. 2018-11-14 09:23:13 +08:00
chenfeiCF ca70a83395 * Adjust for task #5111, #5106. 2018-11-13 17:28:12 +08:00
chenfeiCF cae5cb78c5 * Finish task #5118, #5122, #5125. 2018-11-13 17:23:51 +08:00
Yagami 54b8536e8b * Fix parent task bug. 2018-11-13 17:00:17 +08:00
Yagami 5d1e76c14d * Fix edit parent task bug. 2018-11-13 16:41:08 +08:00
Yagami 95d6bf9c6b * Add custom filed to testtask. 2018-11-13 15:36:15 +08:00
Yagami 635499b551 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-13 15:32:56 +08:00
Yagami 1c7e1a6ece * Finish task #5112. 2018-11-13 15:32:15 +08:00
wangyidong 4639de2307 Merge branch 'master' of github.com:easysoft/zentaopms 2018-11-13 14:50:33 +08:00
wangyidong 643316db3f * code for task #5055. 2018-11-13 14:22:20 +08:00
chenfeiCF 7c348ba665 Merge branch 'master' of github.com:easysoft/zentaopms 2018-11-13 13:49:29 +08:00
chenfeiCF 424a98db4a * Finish task #5111. 2018-11-13 13:49:08 +08:00
wangyidong b88d9ecc07 Merge branch 'master' of github.com:easysoft/zentaopms 2018-11-13 11:26:00 +08:00
wangyidong 72a92afde7 * finish task #5076. 2018-11-13 11:25:33 +08:00
Yagami 05cf1e5a34 * Finish task #5110. 2018-11-13 11:12:23 +08:00
Yagami 30353dc9d4 * Finish task #5113. 2018-11-13 10:04:31 +08:00
wangyidong 834dc8e2fa Merge branch 'master' of github.com:easysoft/zentaopms 2018-11-13 09:51:50 +08:00
wangyidong 3f5f48fd50 * finish task #5078. 2018-11-13 09:51:17 +08:00
chenfeiCF c30ce17efc * Fix error variable name. 2018-11-12 17:41:30 +08:00
Yagami b960442999 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-12 17:10:42 +08:00
Yagami 70e0591023 * Fix parent task status. 2018-11-12 17:09:27 +08:00
chenfeiCF 12eb5a8b6f Merge branch 'master' of github.com:easysoft/zentaopms 2018-11-12 17:00:52 +08:00
Yagami b863fe5f92 * Finish task #5109. 2018-11-12 17:00:22 +08:00
chenfeiCF 92ce72bfad * Finish task #5106. 2018-11-12 17:00:22 +08:00
Yagami ca48885926 * Fix project warning. 2018-11-12 16:39:56 +08:00
Yagami e29d9990aa * Fix module orderBy. 2018-11-12 15:55:47 +08:00
Yagami 9a2a2b234d * Fix module orderBy. 2018-11-12 15:52:20 +08:00
Yagami dd052ef32c Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-12 15:39:58 +08:00
Yagami 59071fe947 * Finish task #5108. 2018-11-12 15:39:46 +08:00
reneeteng f51cdbbae4 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-12 15:26:29 +08:00
reneeteng 191c720d50 * Change project view lang. 2018-11-12 15:24:51 +08:00
Yagami b22c8ca558 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-12 14:44:39 +08:00
Yagami bff8f0161a * Finish task #5105. 2018-11-12 14:44:27 +08:00
chenfeiCF cfeb9b483e Merge branch 'master' of github.com:easysoft/zentaopms 2018-11-12 14:21:54 +08:00
chenfeiCF 2b47dbed37 * Finish task #5085. 2018-11-12 14:20:59 +08:00
wangyidong 470c97a7cd Merge branch 'master' of github.com:easysoft/zentaopms 2018-11-12 14:18:26 +08:00
wangyidong 4c5e97cb2e * code for task #5062. 2018-11-12 14:17:59 +08:00
reneeteng 7f5616c709 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-12 14:12:40 +08:00
reneeteng d95fb0ced5 * Change group desc. 2018-11-12 14:11:40 +08:00
Yagami e054c9b475 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-12 14:06:36 +08:00
Yagami 764287bf07 * Finish task #5104. 2018-11-12 14:06:19 +08:00
wangyidong 4e005e989b Merge branch 'master' of github.com:easysoft/zentaopms 2018-11-12 13:41:41 +08:00
wangyidong 501440338a * finish task #5062. 2018-11-12 13:40:28 +08:00
Yagami 9d5f919e3d * Finish task #5103. 2018-11-12 11:21:34 +08:00
Yagami 222009a2c3 * Finish task #5102. 2018-11-12 11:05:28 +08:00
Yagami a5ee35e792 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-12 10:47:43 +08:00
Yagami d0744054f5 * Finish task #5096. 2018-11-12 10:47:27 +08:00