Commit Graph
10548 Commits
Author SHA1 Message Date
wangyidong 60ebe9fa2e * fix for upgrade. 2017-12-22 09:05:34 +08:00
wangyidong cc8bf62fe5 * fix bug #1008. 2017-12-21 15:27:01 +08:00
wangyidong ee157b0e84 * fix bug #1342. 2017-12-21 15:18:16 +08:00
wangyidong c81d3a4ee7 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-21 14:51:28 +08:00
wangyidong c7d758b6f0 * fix bug #1337. 2017-12-21 14:50:49 +08:00
滔哥 39765cdd13 * Fix bug. 2017-12-21 14:16:45 +08:00
滔哥 7799d1ee42 * Fix bug. 2017-12-21 13:46:16 +08:00
滔哥 bc444c347d Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-21 13:06:26 +08:00
滔哥 04c33a382a * Fix bug 2017-12-21 13:06:21 +08:00
滔哥 897686168d * Fix bug 2017-12-21 12:41:42 +08:00
wangyidong 318c120538 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-21 11:22:33 +08:00
wangyidong 9e628c464b * fix bug for export with child. 2017-12-21 11:22:10 +08:00
滔哥 f1467eba02 * Fix bug 2017-12-21 09:27:39 +08:00
wangyidong c6778fdd17 * adjust for doc showfiles page. 2017-12-20 17:04:55 +08:00
wangyidong afb023fca9 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-20 16:47:01 +08:00
wangyidong a42b0008c9 * adjust for demo. 2017-12-20 16:46:42 +08:00
Your Name 2089850a63 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-20 16:26:50 +08:00
Your Name 40a653554d * Fix Bug #1245. 2017-12-20 16:25:25 +08:00
tengfei 7df4d8febf Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-20 16:13:58 +08:00
tengfei 117096919d bug open on change 2017-12-20 16:13:43 +08:00
wangyidong 6b3ed58d8b Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-20 16:10:56 +08:00
wangyidong b7ce9dc971 * adjust for story field for custom. 2017-12-20 16:10:34 +08:00
wangyidong f0c123d2a8 * change for show demo in login. 2017-12-20 15:42:48 +08:00
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
滔哥 a2e3441a46 * Fix bug 2017-12-20 14:42:58 +08:00
滔哥 515ba0a242 * Format code. 2017-12-20 14:16:25 +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