Commit Graph

8517 Commits

Author SHA1 Message Date
wangyidong
32d218b92f * change for english demo. 2017-12-20 15:42:04 +08:00
wangyidong
5a915e7334 * adjust for bug printCell. 2017-12-20 15:41:01 +08:00
滔哥
44be5a2d92 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-20 14:01:12 +08:00
滔哥
a9c67a1030 * Fix bug#1341 2017-12-20 14:01:05 +08:00
Catouse
94557d5de5 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-20 11:30:12 +08:00
Catouse
a775af4846 * finish task #3371. 2017-12-20 11:30:07 +08:00
滔哥
a168e9a231 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-20 11:21:58 +08:00
滔哥
674d840161 * Fix bug#1344 2017-12-20 11:21:53 +08:00
wangyidong
271b52a889 * fix bug #1330. 2017-12-20 11:17:05 +08:00
滔哥
5c8e01875b * Fix bug#1349 2017-12-20 11:02:54 +08:00
滔哥
0c8e120075 * Fix bug#1348 2017-12-20 10:51:22 +08:00
滔哥
f0bc9b4312 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-20 10:45:30 +08:00
wangyidong
292d447578 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-20 10:45:11 +08:00
wangyidong
61d1e0ceec * fix bug for checked. 2017-12-20 10:44:49 +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
滔哥
23c4e386c1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-20 10:06:10 +08:00
wangyidong
1829ecd6e7 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-20 09:15:43 +08:00
wangyidong
247fc74ec9 * fix bug #1340. 2017-12-20 09:15:20 +08:00
滔哥
41d4f83c32 * Fix bug#1341 2017-12-19 17:40:43 +08:00
滔哥
f4e2a0db03 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-19 17:37:04 +08:00
滔哥
b8fa2165ab * Fix bug dev API. 2017-12-19 17:36:59 +08:00
wangyidong
6574cecec4 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-19 17:21:43 +08:00
wangyidong
5c7ff9a216 * fix bug #1283. 2017-12-19 17:21:19 +08:00
滔哥
20e63398a3 * Fix bug#1335 2017-12-19 17:18:47 +08:00
滔哥
4830880ebe * Fix tips. 2017-12-19 17:02:38 +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
滔哥
9e2ce14436 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-19 15:28:26 +08:00
滔哥
42e4aec31f * Fix Bug 2017-12-19 15:01:10 +08:00
滔哥
f7080930b1 * Fix Bug#1328 2017-12-19 14:19:33 +08:00
wangyidong
bd0694658c * adjust for project story. 2017-12-19 14:18:51 +08:00
wangyidong
a0b1844984 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-19 14:00:27 +08:00
wangyidong
ab4f445f19 * finish task #3475. 2017-12-19 14:00:08 +08:00
滔哥
f157829c16 * Fix Bug#1326 2017-12-19 13:54:40 +08:00
滔哥
8765fc7f6a Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-19 10:28:26 +08:00
滔哥
1e05a84212 * Task#3467 2017-12-19 10:28:20 +08:00
wangyidong
ae57a9827f Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-19 10:00:07 +08:00
wangyidong
39d39bc4d8 * finish task #3444. 2017-12-19 09:59:40 +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
wangyidong
4e920d9133 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-18 14:36:54 +08:00
wangyidong
44bc56562f * finish task #3395. 2017-12-18 14:36:24 +08:00
滔哥
507a436704 * Fix bug#1275 2017-12-18 13:57:20 +08:00