Commit Graph
8321 Commits
Author SHA1 Message Date
滔哥 e1f20d5ef1 * Fix bug 1278 2017-12-04 14:50:09 +08:00
滔哥 aa391ba138 * Fix bug 1278 2017-12-04 14:49:54 +08:00
滔哥 8165e6c31e Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-04 13:33:03 +08:00
滔哥 11ad8f1d95 * Fix bug 1315 2017-12-04 13:32:17 +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
滔哥 aaada03ccf Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-01 16:25:02 +08:00
滔哥 67c4ed6cc4 * Fix 1317 2017-12-01 16:24:56 +08:00
wangyidong ede35673b6 * fix bug #1292. 2017-12-01 15:15:38 +08:00
wangyidong 6df5ea2645 * fix bug #1293. 2017-12-01 14:45:51 +08:00
wangyidong c2fe7af6f0 * fix bug #1284. 2017-12-01 14:44:04 +08:00
wangyidong 0a45abd11e Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-01 14:28:13 +08:00
wangyidong a6aeaf2cb5 * fix bug #1285. 2017-12-01 14:27:51 +08:00
滔哥 ba7422ca22 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-01 14:24:03 +08:00
滔哥 7b9b7d4a40 * Fix bug 2017-12-01 14:23:57 +08:00
wangyidong 62cc162358 * fix bug #1286. 2017-12-01 14:10:19 +08:00
wangyidong 29f7e91a9f * fix bug #1290. 2017-12-01 14:00:21 +08:00
wangyidong be4b832909 * fix bug #1296. 2017-12-01 13:55:14 +08:00
wangyidong 18cb10cfa3 * fix bug #1306. 2017-12-01 13:48:33 +08:00
wangyidong 8be716b8a5 * fix bug #1309. 2017-12-01 13:17:16 +08:00
wangyidong eac28529d6 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-01 11:26:27 +08:00
wangyidong 74adf6ae8f * fix bug #1316. 2017-12-01 11:25:51 +08:00
滔哥 c49a2c8fca * Fix bug 2017-12-01 11:24:53 +08:00
wangyidong 3664bd09c8 * fix bug #1314. 2017-12-01 10:44:21 +08:00
wangyidong ef4e8a2cbd * fix bug #1310. 2017-12-01 09:43:56 +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 057f8978b1 * fix bug #1300. 2017-12-01 09:09:15 +08:00
wangyidong 08bbbeabfb * fix bug #1303. 2017-12-01 09:06:00 +08:00
wangyidong 97725f46b1 * adjust code for pro. 2017-11-30 17:30:42 +08:00
wangyidong 5aae8732dd * fix bug #843. 2017-11-30 14:13:25 +08:00
wangyidong 76ea4b62e5 * fix bug #993. 2017-11-30 09:25:22 +08:00
wangyidong 33415b566b Merge branch 'master' of github.com:easysoft/zentaopms 2017-11-30 09:04:23 +08:00
wangyidong 759b3950cb * fix bug #1081. 2017-11-30 09:03:40 +08:00
滔哥 35d244ac4c Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-11-29 15:52:24 +08:00
滔哥 7b0571d18f * User list add title 2017-11-29 15:52:14 +08:00
wangyidong 9d5485ec6a Merge branch 'master' of github.com:easysoft/zentaopms 2017-11-29 14:48:53 +08:00
wangyidong a8fb159310 * fix error. 2017-11-29 14:47:40 +08:00
tengfei 36fa1e01ae Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-11-27 17:08:55 +08:00
tengfei 5a4f5057d6 “minor change 2017-11-27 17:08:29 +08:00
滔哥 232cdee076 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-11-24 15:59:18 +08:00
滔哥 d16dc28d93 * Fix bug 2017-11-24 15:59:02 +08:00
tengfei 03aa706057 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-11-24 11:10:13 +08:00
tengfei edc8c80cec effort & man-hour 2017-11-24 11:10:02 +08:00
wangyidong ec8fcb6521 * change for export bug. 2017-11-23 16:53:06 +08:00
wangyidong 5d63380722 * add commonModel::http method. 2017-11-23 16:52:34 +08:00
滔哥 a0fd8d6e9f Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-11-23 16:10:59 +08:00
滔哥 c7b03419ae * Fix report style 2017-11-23 16:10:51 +08:00
wangyidong cf097da3b8 Merge branch 'master' of github.com:easysoft/zentaopms 2017-11-21 17:10:38 +08:00
wangyidong e5daf6f56f * finish task #6308. 2017-11-21 17:10:07 +08:00