Commit Graph
10450 Commits
Author SHA1 Message Date
wangyidong 583d24be0e * finish for task #3443. 2017-12-14 16:36:16 +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
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
滔哥 2c896fbe8f * Task #3456 Add SQL 2017-12-14 09:36: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 6006f3e93a * finish task #3397. 2017-12-13 14:22:09 +08:00
wangyidong 526dad43d3 * finish task #3394. 2017-12-13 14:07:25 +08:00
wangyidong 22f4518437 * finish task #3383. 2017-12-13 13:38:46 +08:00
wangyidong 391ac047d9 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-13 13:13:30 +08:00
wangyidong 452ab148f0 * remove test code. 2017-12-13 13:11:20 +08:00
滔哥 b5b0bb53ce Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-13 12:06:59 +08:00
滔哥 3571212ee3 * Format code 2017-12-13 12:06:52 +08:00
wangyidong cfce20ea3b * finish task #3375. 2017-12-13 11:35:20 +08:00
wangyidong 3eba5feb13 * code for task #3476. 2017-12-13 11:33:55 +08:00
wangyidong db3b3deafb * code for task #3476. 2017-12-13 11:12:21 +08:00
wangyidong 0205849cc2 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-13 10:57:30 +08:00
wangyidong c404eff816 * finish task #3476. 2017-12-13 10:56:56 +08:00
滔哥 dc817f3e54 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-13 10:09:32 +08:00
tengfei 8d3a733612 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-13 09:54:23 +08:00
tengfei 7dacfb2f78 action-common 2017-12-13 09:54:06 +08:00
滔哥 a2672a6c44 * Task #3446 2017-12-12 17:42:42 +08:00
滔哥 926340dcd4 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-12 17:41:58 +08:00
滔哥 d7cec4597f * Task #3456 add lang 2017-12-12 16:52:20 +08:00
滔哥 f877273082 * Format code 2017-12-12 16:51:57 +08:00
wangyidong 9a904d2501 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-12 16:51:10 +08:00
wangyidong 4049379042 * fix for auto delete. 2017-12-12 16:50:38 +08:00
滔哥 e923b6ab92 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-12 15:30:59 +08:00
滔哥 df84a91b74 * Task#3407 2017-12-12 15:30:52 +08:00