Commit Graph
2523 Commits
Author SHA1 Message Date
Yagami 923e4fb8fb Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-26 10:30:57 +08:00
Yagami da57fc447d * Finish task #5170. 2018-12-26 10:30:34 +08:00
wangyidong 4554a44aae * finish task #5172. 2018-12-26 09:47:05 +08:00
Yagami 55a9c65279 * Fix task create view. 2018-12-24 15:05:54 +08:00
wangyidong 89efeaca7f * adjust for with xuanxuan. 2018-12-21 15:02:48 +08:00
wangyidong 92e61922e3 * adjust for locate page after create. 2018-12-21 10:22:42 +08:00
wangyidong 46bf4c9baa Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-20 17:18:20 +08:00
wangyidong 5ebceea09a * add project field for create task. 2018-12-20 17:16:50 +08:00
reneeteng 46f9eef6bf * Lang change. 2018-12-20 16:03:55 +08:00
Yagami 563ece6990 * Fix bugs. 2018-12-20 13:28:24 +08:00
wangyidong df6ca19290 * adjust for xuanxuan locate page. 2018-12-19 16:44:41 +08:00
wangyidong d3fa148cb3 * close modal in xuanxuan. 2018-12-19 13:44:31 +08:00
wangyidong 619a830262 Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-18 17:21:57 +08:00
wangyidong ad609850ab * code for task #5156,5147. 2018-12-18 17:20:57 +08:00
reneeteng 8543a1458b Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-18 16:57:14 +08:00
reneeteng 9795502bae * COST lang change. 2018-12-18 16:56:15 +08:00
chenfeiCF 37c96cbfa6 * Code for task #5156. 2018-12-18 14:32:10 +08:00
chenfeiCF 5b611cd068 * Code for task #5156. 2018-12-18 14:15:14 +08:00
wangyidong 201e157ffd * adjust for doc and testtask view for xuanxuan. 2018-12-17 15:39:49 +08:00
Yagami 699e5458d0 * Finish task #5149. 2018-12-12 17:12:43 +08:00
Yagami ae1466a9d4 * Fix bug #2313. 2018-12-03 10:16:18 +08:00
Yagami d7dde0bc00 * Fix bug #2307. 2018-11-23 14:56:23 +08:00
wangyidong ad0eb0a7ba * add new version and upgrade. 2018-11-20 15:05:36 +08:00
Catouse 00c74cba26 * code for task #5086. 2018-11-20 09:10:51 +08:00
Catouse e87f44e6af * code for task #5086. 2018-11-20 08:59:00 +08:00
chenfeiCF 18452bba9c * Adjust for task #5106. 2018-11-19 16:07:45 +08:00
Yagami 6e71947629 * Fix testtask action. 2018-11-19 16:00:52 +08:00
wangyidong dd334ee161 Merge branch 'master' of github.com:easysoft/zentaopms 2018-11-19 14:44:53 +08:00
wangyidong 4809e3d1ea * adjust code. 2018-11-19 14:43:49 +08:00
chenfeiCF 072f46710c * Finish task #5132. 2018-11-19 14:37:48 +08:00
wangyidong 051db182d8 * fix bug #2283. 2018-11-16 13:23:19 +08:00
Yagami f3fe52df6d * Fix bug #2296. 2018-11-16 09:14:58 +08:00
chenfeiCF 496964c1b0 Merge branch 'master' of github.com:easysoft/zentaopms 2018-11-15 15:21:16 +08:00
chenfeiCF cefdbaa5d3 * Finish task #5133. 2018-11-15 15:20:42 +08:00
Catouse 9fc889340f * finish task #5086. 2018-11-15 15:19:39 +08:00
reneeteng b9e4f1c766 * Lang optimized. 2018-11-15 09:57:30 +08:00
Yagami 8b71c1ea3a * Finish task #5142. 2018-11-14 16:28:07 +08:00
Yagami bf1dc7be3f * Fix child task bug. 2018-11-14 13:52:02 +08:00
chenfeiCF ca70a83395 * Adjust for task #5111, #5106. 2018-11-13 17:28:12 +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
chenfeiCF 424a98db4a * Finish task #5111. 2018-11-13 13:49:08 +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 92ce72bfad * Finish task #5106. 2018-11-12 17:00:22 +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 2b47dbed37 * Finish task #5085. 2018-11-12 14:20:59 +08:00
Yagami 764287bf07 * Finish task #5104. 2018-11-12 14:06:19 +08:00