Commit Graph
8470 Commits
Author SHA1 Message Date
滔哥 9c10a2a2f6 * Fix bug#1327 2017-12-18 16:49:23 +08:00
滔哥 2bc327efa0 * Fix bug 2017-12-18 15:05:55 +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
wangyidong 3ab22b4ac0 * finish task #3449. 2017-12-15 10:35:49 +08:00
wangyidong f35ef39f89 * finish task #3449. 2017-12-15 10:09:42 +08:00
滔哥 073ff8fdb4 * Format code 2017-12-14 18:27:26 +08:00
wangyidong 04c5c50cce * fix bug. 2017-12-14 17:00:28 +08:00
滔哥 5b6d0accd2 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-14 16:54:09 +08:00
滔哥 5145126ad0 * Fix bug 2017-12-14 16:53:59 +08:00
wangyidong 583d24be0e * finish for task #3443. 2017-12-14 16:36:16 +08:00
滔哥 831183be84 * Task#3456 2017-12-14 15:32:37 +08:00
wangyidong e821b758c0 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-14 15:30:33 +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
wyd621 4dc6fcb16d Merge pull request #17 from dajiao007/master
* finish the task of 3423
2017-12-14 14:56:27 +08:00
dajiao007 7770bab6af * fix the story of 3423 2017-12-14 14:24:30 +08:00
wangyidong fc70d4ffdb * finish task #3491. 2017-12-14 14:06:47 +08:00
wangyidong a069ceb654 * change for task #3435. 2017-12-14 13:49:43 +08:00
wangyidong 0f13899945 * code for task #3427. 2017-12-14 11:37:48 +08:00
wangyidong 592413c431 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-14 11:21:44 +08:00
滔哥 b4517c9945 * Fix bug 2017-12-14 11:17:15 +08:00
wangyidong 5057abf5d8 * finish task #3427. 2017-12-14 11:16:03 +08:00
滔哥 4efc830f31 * Change tips. 2017-12-14 10:34:28 +08:00
滔哥 9c7df9ce2e Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-14 10:32:39 +08:00
滔哥 a259a31891 * Add tips for create user. 2017-12-14 10:32:29 +08:00
wangyidong 12a898ef96 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-14 09:39:32 +08:00
wangyidong b3515831b8 * finish task #3468. 2017-12-14 09:38:39 +08:00
滔哥 f21bfab1eb * Task #3465 2017-12-13 21:38:15 +08:00
滔哥 3697775a1a * Format code 2017-12-13 21:31:35 +08:00
滔哥 2f966a1d9d * Task #3465 2017-12-13 21:29:58 +08:00
滔哥 f34e4c7ee3 * Task #3465 2017-12-13 19:30:29 +08:00
滔哥 7449b93402 * Task #3465 2017-12-13 19:17:29 +08:00
滔哥 f289c99c98 * Task #3465 2017-12-13 16:48:18 +08:00
滔哥 3a15a8ed69 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-13 16:41:43 +08:00
滔哥 0e5b6e52ce * Task #3448 2017-12-13 16:41:38 +08:00
wangyidong 5fc4f0dadb * finish task #3433. 2017-12-13 16:06:00 +08:00
wangyidong 221291c0f3 * finish task #3429. 2017-12-13 15:52:36 +08:00
wangyidong 526dad43d3 * finish task #3394. 2017-12-13 14:07:25 +08:00