Commit Graph
10510 Commits
Author SHA1 Message Date
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
滔哥 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 aeaaeb67d8 * fix bug for cache. 2017-12-18 17:30:01 +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
滔哥 e6bcc3101c * Fix bug#1214 2017-12-18 13:43:52 +08:00
滔哥 096693ab2c Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-18 11:00:55 +08:00
滔哥 8a7a437960 * Task #3396 and Fix bug 2017-12-18 11:00:29 +08:00
wangyidong 5dab74c631 * finish task #3480. 2017-12-18 10:34:34 +08:00
wangyidong 020acf5f43 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-18 10:02:39 +08:00
wangyidong a68fe9adcd * finish task 3463. 2017-12-18 10:01:08 +08:00
滔哥 1de783bf74 * Fix bug 2017-12-15 15:15:08 +08:00
滔哥 5d656b0a08 * Task#3387 2017-12-15 13:37:24 +08:00
滔哥 f840fab1b7 * Format code 2017-12-15 11:11:05 +08:00
滔哥 9b238d008a Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-15 11:06:07 +08:00
滔哥 fce5340d36 * Task #3465 2017-12-15 11:06:01 +08:00
wangyidong 6cd9793d00 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-15 10:36:29 +08:00