Commit Graph
10259 Commits
Author SHA1 Message Date
tengfei edc8c80cec effort & man-hour 2017-11-24 11:10:02 +08:00
tengfei d0cb562048 ok.txt->file 2017-11-20 19:08:56 +08:00
滔哥 f6b3158c48 * Fix bug 2017-11-20 15:19:12 +08:00
wangyidong 7cd852a712 Merge branch 'master' of github.com:easysoft/zentaopms 2017-11-17 16:15:59 +08:00
wangyidong c53dabe4b1 * add project deviation chart. 2017-11-17 16:14:55 +08:00
tengfei bb03a47b45 story desc 2017-11-17 15:16:31 +08:00
滔哥 a12fefb2a6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-11-17 15:02:35 +08:00
滔哥 bda8f7434f * Fix bug in php7.1 2017-11-17 15:02:26 +08:00
wangyidong cc173a41f6 * fix error. 2017-11-17 15:00:22 +08:00
wangyidong b94d4e2dcb * fix bug #1289. 2017-11-17 14:18:26 +08:00
wangyidong ec88c8c85a * fix bug #1287,1288. 2017-11-17 13:18:11 +08:00
wangyidong daa396bbcb * fix db sql. 2017-11-17 12:29:12 +08:00
wangyidong 3da2a97b48 * change for 9.6.2 version. 2017-11-17 11:54:19 +08:00
滔哥 6a87a80a4d * Fix bug 2017-11-17 11:38:45 +08:00
滔哥 9d54e787fc * Fix Bug 2017-11-17 11:23:21 +08:00
滔哥 a74ea03424 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-11-17 09:17:14 +08:00
滔哥 63eaccc04b * Fix bug 2017-11-17 09:17:07 +08:00
wangyidong bc9cf41beb Merge branch 'master' of github.com:easysoft/zentaopms 2017-11-16 15:26:49 +08:00
wangyidong ad3ce6bab6 * change for pro. 2017-11-16 15:26:20 +08:00
wangyidong dcec446d69 * fix bug for send mail with ztcloud. 2017-11-16 15:25:59 +08:00
滔哥 67a0263646 * Add story tips lang for todo 2017-11-15 19:04:42 +08:00
滔哥 20d15486c5 * Add story for todo 2017-11-15 18:44:24 +08:00
滔哥 c417c2fd70 * Add story for todo 2017-11-15 18:37:15 +08:00
滔哥 5e47b860d8 * Add story for todo 2017-11-15 18:25:22 +08:00
滔哥 400c4838f5 * Add story for todo 2017-11-15 17:10:33 +08:00
滔哥 602a95cfd2 * Add story for todo 2017-11-15 16:52:27 +08:00
滔哥 f425743a8d * Fix bug 2017-11-15 15:28:00 +08:00
滔哥 3a9b7dd103 * Format code and Add story for todo module 2017-11-15 14:52:16 +08:00
wangyidong dd5047a5da Merge branch 'master' of github.com:easysoft/zentaopms 2017-11-14 16:34:52 +08:00
wangyidong ed078b58c3 * change datatable for pro. 2017-11-14 16:33:59 +08:00
wangyidong 440946f087 * finish task #6289 for pro. 2017-11-14 16:24:35 +08:00
滔哥 2087e26166 * Fix score bug 2017-11-13 14:52:52 +08:00
wangyidong de1824bf42 * adjust after exec page. zentaopms_9.6.1_20171113 2017-11-13 09:18:47 +08:00
wangyidong 19005ae853 * change for new version. 2017-11-13 09:05:30 +08:00
liugang ce5750f654 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-11-13 08:55:26 +08:00
liugang 16e6097773 * Adjust codes. 2017-11-13 08:35:59 +08:00
Catouse 78b4295e65 * finish task #3342. 2017-11-10 17:04:44 +08:00
wangyidong 55cefacc57 * adjust for project task page. 2017-11-10 16:25:59 +08:00
wangyidong 97d490f008 * change for zh-tw lang. 2017-11-10 15:49:48 +08:00
wangyidong 9c8f506fbe * fix bug #1125. 2017-11-10 14:08:00 +08:00
wangyidong 9b820f143d * fix bug #1246. 2017-11-10 13:57:41 +08:00
滔哥 53765e00da Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-11-10 11:37:48 +08:00
滔哥 c21128595e * Fix task bug 2017-11-10 11:37:42 +08:00
wangyidong a5464f2c18 Merge branch 'master' of github.com:easysoft/zentaopms 2017-11-10 11:23:46 +08:00
wangyidong 5d6609181d * fix bug #1265. 2017-11-10 11:23:22 +08:00
滔哥 b90c3ac9eb * Fix bug 2017-11-10 10:58:24 +08:00
liugang a82ce075b0 * Finish task #3325. 2017-11-10 10:51:29 +08:00
wangyidong 23711177c5 * fix bug #1269. 2017-11-10 10:41:26 +08:00
wangyidong d6df4deeae Merge branch 'master' of github.com:easysoft/zentaopms 2017-11-10 10:34:36 +08:00
wangyidong 6957ae1681 * fix bug #1271. 2017-11-10 10:34:13 +08:00