Commit Graph
10363 Commits
Author SHA1 Message Date
滔哥 a4e4761c8a * Task#3450 2017-12-07 14:13:24 +08:00
滔哥 3eb02d09cb * Task#3413 2017-12-07 14:03:51 +08:00
滔哥 35af295955 * Task#3409 2017-12-07 13:59:00 +08:00
滔哥 da38db6ef5 * Task#3503 2017-12-07 13:55:01 +08:00
滔哥 f13e402bb0 * Add batch change stage for project story. 2017-12-07 10:44:54 +08:00
tengfei 522f28dd39 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-06 17:47:50 +08:00
tengfei 8314d813cb 12/6 trans error done 2017-12-06 17:47:31 +08:00
liugang 82188fd188 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-06 17:36:01 +08:00
liugang 4f22090677 * Load my.php at last. 2017-12-06 17:34:36 +08:00
滔哥 5b1e544dff * Chang testtask block link. 2017-12-06 17:05:58 +08:00
滔哥 acf1410e59 * Change style 2017-12-06 16:32:11 +08:00
滔哥 6f43344754 * Format Code 2017-12-06 16:11:18 +08:00
滔哥 e081bad9f1 * Task#3438 2017-12-06 15:47:42 +08:00
滔哥 cb9bba12a9 * Fix end date bug 2017-12-06 14:53:56 +08:00
滔哥 75fdcaa780 * Task #3386 && Bug #1264 2017-12-06 14:34:10 +08:00
滔哥 734cfcd9bc * Format code. 2017-12-06 14:14:39 +08:00
滔哥 fcb87dc1a1 * Task #3434 2017-12-06 13:21:16 +08:00
滔哥 1132bf8c7e * Task #3430 2017-12-06 10:45:38 +08:00
滔哥 ea28589fd9 * Task #3430 2017-12-06 09:42:54 +08:00
滔哥 6652b9221c * Task #3462 2017-12-05 23:23:10 +08:00
滔哥 ef31488fa0 * Task #3458 2017-12-05 22:52:18 +08:00
滔哥 7358ada1f6 * Task #3464 2017-12-05 22:45:15 +08:00
滔哥 797260dffe * Add back parent task btn for child task. 2017-12-05 22:27:10 +08:00
滔哥 95040eb64f * Fix task bug 2017-12-05 22:00:47 +08:00
滔哥 8663227af1 * Fix task bug 2017-12-05 21:53:18 +08:00
tengfei e09fe8c01a Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-05 17:35:01 +08:00
tengfei 5c8b72ddf0 translation error 12/5 2017-12-05 17:34:48 +08:00
滔哥 e3ba0b0216 * Change Url for En Notice 2017-12-05 16:17:09 +08:00
滔哥 6376a64a93 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-05 14:21:49 +08:00
滔哥 f8b0050c38 * Change Url for En Notice 2017-12-05 14:21:03 +08:00
tengfei ee44254608 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-05 11:26:51 +08:00
tengfei 232d00dbcd translation minor error 2017-12-05 11:24:06 +08:00
滔哥 e1075f32df * Task 3481 2017-12-05 11:08:24 +08:00
滔哥 ee85a1accd * Task 3451 2017-12-04 17:45:43 +08:00
wangyidong 2d65d4a222 * change for zh-tw and upgrade. zentaopms_9.6.3_20171204 2017-12-04 16:45:16 +08:00
wangyidong e8e24b9109 * fix for datatable check. 2017-12-04 16:37:35 +08:00
滔哥 1a1321e57c * Fix bug 2017-12-04 15:57:37 +08:00
滔哥 619608946d Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-04 15:57:09 +08:00
Catouse b0feda7029 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-04 15:53:45 +08:00
wangyidong da6a23e7bc * fix bug #1132. 2017-12-04 15:24:27 +08:00
Catouse 1bd227029a Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-04 15:14:52 +08:00
Catouse 5a76b904b3 * fix bug #1294. 2017-12-04 15:14:45 +08:00
wangyidong e082c20f90 * fix bug #1252. 2017-12-04 14:51:35 +08:00
滔哥 e1f20d5ef1 * Fix bug 1278 2017-12-04 14:50:09 +08:00
滔哥 aa391ba138 * Fix bug 1278 2017-12-04 14:49:54 +08:00
wangyidong 91cc9135f1 * fix bug #1262. 2017-12-04 14:21:12 +08:00
wangyidong d7ed9c0bbb * adjust code for showimport. 2017-12-04 14:09:51 +08:00
wangyidong e2333b70a2 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-04 13:38:53 +08:00
wangyidong e2070d56b1 * fix bug #1279. 2017-12-04 13:37:43 +08:00
滔哥 8165e6c31e Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-04 13:33:03 +08:00