Commit Graph
14069 Commits
Author SHA1 Message Date
reneeteng 2ffaaa91a7 * Extension lang changed. 2018-11-26 09:54:27 +08:00
reneeteng 37e2c1205a Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-15 09:57:57 +08:00
reneeteng b9e4f1c766 * Lang optimized. 2018-11-15 09:57:30 +08:00
Yagami 43816350b0 * Fix project menu order. 2018-11-15 09:10:17 +08:00
Yagami 7bda99a84b Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-15 09:08:25 +08:00
Yagami e6feb5f675 * Fix project menu. 2018-11-15 09:08:01 +08:00
reneeteng 0f455e04bf Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-14 16:58:15 +08:00
reneeteng f8b08d842b *Change lang. 2018-11-14 16:57:42 +08:00
Yagami 94c6ecedf6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-14 16:28:24 +08:00
Yagami 8b71c1ea3a * Finish task #5142. 2018-11-14 16:28:07 +08:00
Catouse e3efb2e5af Merge branches 'master' and 'master' of https://github.com/easysoft/zentaopms 2018-11-14 15:30:33 +08:00
Catouse d383aeb1a8 * fix title attribute int datatable not work. 2018-11-14 15:30:19 +08:00
Yagami d81aef132c Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-14 15:21:01 +08:00
Yagami 65ba8a4786 * Finish task #5077. 2018-11-14 15:20:39 +08:00
chenfeiCF 2771600905 * Finish task #5124. 2018-11-14 15:20:26 +08:00
chenfeiCF 4a021cb8a5 * Finish task #5123. 2018-11-14 14:52:00 +08:00
chenfeiCF f37251a734 * Finish task #5119. 2018-11-14 14:34:04 +08:00
Yagami 2d26caad2e * Finish task #5084. 2018-11-14 14:10:23 +08:00
Yagami bf1dc7be3f * Fix child task bug. 2018-11-14 13:52:02 +08:00
Yagami 1024ca6376 * Fix task main menu. 2018-11-14 10:51:40 +08:00
Yagami 581584286b Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-14 10:48:06 +08:00
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 55d5719369 * code for task #5066. 2018-11-14 10:46:44 +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