Commit Graph

1027 Commits

Author SHA1 Message Date
滔哥
a9c67a1030 * Fix bug#1341 2017-12-20 14:01:05 +08:00
滔哥
a168e9a231 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-20 11:21:58 +08:00
wangyidong
271b52a889 * fix bug #1330. 2017-12-20 11:17:05 +08:00
滔哥
7928df6cfa * Fix bug for task export. 2017-12-20 10:44:18 +08:00
滔哥
3a951368ce * Fix bug#1292 2017-12-20 10:24:33 +08:00
滔哥
41d4f83c32 * Fix bug#1341 2017-12-19 17:40:43 +08:00
滔哥
8cb3927ca5 * Fix Bug#1329 2017-12-19 15:49:27 +08:00
滔哥
0de914da5c * Fix bug 2017-12-19 15:33:48 +08:00
滔哥
f7080930b1 * Fix Bug#1328 2017-12-19 14:19:33 +08:00
滔哥
f157829c16 * Fix Bug#1326 2017-12-19 13:54:40 +08:00
滔哥
1e05a84212 * Task#3467 2017-12-19 10:28:20 +08:00
滔哥
c4f8508e5a * Task#3467 2017-12-18 18:44:36 +08:00
wangyidong
c5d8eec378 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-18 17:17:01 +08:00
wangyidong
1060a606c6 * finish task #3455. 2017-12-18 17:16:34 +08:00
滔哥
9e88268d84 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-18 16:50:06 +08:00
滔哥
9c10a2a2f6 * Fix bug#1327 2017-12-18 16:49:23 +08:00
tengfei
ca394008be Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-18 16:16:06 +08:00
tengfei
09a94f7752 create change 2017-12-18 16:15:49 +08:00
滔哥
2bc327efa0 * Fix bug 2017-12-18 15:05:55 +08:00
滔哥
5145126ad0 * Fix bug 2017-12-14 16:53:59 +08:00
wangyidong
11d80a5d93 * finish task #3442. 2017-12-14 15:29:09 +08:00
滔哥
24366d4e54 * Fix Bug 2017-12-14 15:12:05 +08:00
tengfei
b8f5165d57 report translation change 2017-12-12 14:42:36 +08:00
滔哥
fc235d0381 * Task #3440 2017-12-12 10:52:11 +08:00
滔哥
9efbce145c * Task #3432 2017-12-12 10:30:34 +08:00
滔哥
daa6aedf77 * Child task order 2017-12-11 17:04:15 +08:00
wangyidong
54afa9bce1 * fix bug. 2017-12-11 14:37:00 +08:00
滔哥
8bc6e888e8 * Task #3504 2017-12-08 13:50:20 +08:00
滔哥
5ee2c261f6 * Task#3436 2017-12-07 16:16:35 +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
滔哥
ef31488fa0 * Task #3458 2017-12-05 22:52:18 +08:00
滔哥
797260dffe * Add back parent task btn for child task. 2017-12-05 22:27:10 +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
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
滔哥
1a1321e57c * Fix bug 2017-12-04 15:57:37 +08:00
wangyidong
37aeaa887f * fix bug #1291. 2017-12-04 13:16:38 +08:00
wangyidong
bf7126e3af * fix bug #1297. 2017-12-04 11:36:18 +08:00
wangyidong
ede35673b6 * fix bug #1292. 2017-12-01 15:15:38 +08:00
wangyidong
c2fe7af6f0 * fix bug #1284. 2017-12-01 14:44:04 +08:00
wangyidong
a6aeaf2cb5 * fix bug #1285. 2017-12-01 14:27:51 +08:00
wangyidong
be4b832909 * fix bug #1296. 2017-12-01 13:55:14 +08:00
wangyidong
66e5d7f47a * fix bug #1313. 2017-12-01 09:36:22 +08:00
wangyidong
fca246824a * fix bug #1298. 2017-12-01 09:17:04 +08:00
wangyidong
76ea4b62e5 * fix bug #993. 2017-11-30 09:25:22 +08:00
tengfei
edc8c80cec effort & man-hour 2017-11-24 11:10:02 +08:00