Commit Graph

1310 Commits (ff5b339ce81125ed31ca1e08ad59d031abc236c4)

Author SHA1 Message Date
ibuler 09416286bf fix install port bug 2015-12-29 13:09:05 +08:00
ibuler c5f9db450d 添加查看quickstart提示 2015-12-29 11:37:52 +08:00
ibuler 1e93b13b4c Merge branch 'master' of github.com:ibuler/jumpserver 2015-12-29 11:13:04 +08:00
ibuler 48cf64cd3a port int 2015-12-29 11:12:41 +08:00
ibuler ff3666c6af Update README.md 2015-12-28 11:08:23 +08:00
ibuler 3918025ffd Update README.md 2015-12-28 10:53:00 +08:00
ibuler 1b7ee3b575 返回上个版本 2015-12-26 11:09:48 +08:00
ibuler b370f01551 Merge branch 'master' into dev 2015-12-26 10:53:01 +08:00
ibuler 18da6f69a2 Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev 2015-12-26 10:52:57 +08:00
yumaojun d040e2719f 修复Role 删除时 秘钥问题等异常引起的Bug 2015-12-26 10:12:00 +08:00
ibuler 9eb64466bc fix user perm group perm 2015-12-25 20:26:31 +08:00
ibuler 9fc0c9da06 Merge branch 'master' of github.com:ibuler/jumpserver 2015-12-24 11:31:31 +08:00
ibuler f63b75c01b fix 随机密码默认长度 2015-12-24 11:31:05 +08:00
ibuler aa1dea1b08 Merge pull request #26 from wcc526/master
fix remote ip bug
2015-12-23 15:24:19 +08:00
chi-chi weng 71116bc525 fix remote ip bug
fix remote ip bug
2015-12-23 15:17:14 +08:00
ibuler 8f1e8af2e1 Merge branch 'dev' 2015-12-22 23:12:08 +08:00
ibuler c691759af8 Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev 2015-12-22 23:12:02 +08:00
yumaojun d604639b96 修复添加role 时 因私钥格式不对而引起的bug(2) 2015-12-22 23:05:38 +08:00
ibuler cde3185a20 Merge branch 'dev' 2015-12-22 22:50:17 +08:00
ibuler 40ae57d7ea Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev 2015-12-22 22:50:08 +08:00
ibuler 9efd42d4ed 添加team照片 2015-12-22 22:49:59 +08:00
yumaojun 3248ee1a3d 修复添加role 时 因私钥格式不对而引起的bug 2015-12-22 22:39:59 +08:00
ibuler 13d325e259 捕捉smtp异常 2015-12-22 17:18:53 +08:00
ibuler 79994e13c7 添加交流群 2015-12-22 15:57:16 +08:00
ibuler 3f9a9157f4 添加交流群 2015-12-22 15:56:39 +08:00
ibuler 7adcb11f1d comment newline 2015-12-21 16:58:30 +08:00
ibuler 42f6392cc4 fix install script bug 2015-12-21 16:10:07 +08:00
ibuler 835e32b1cc service.sh 脚本修改 2015-12-21 14:28:12 +08:00
ibuler a7e2592fa8 fix install bug 2015-12-21 12:18:36 +08:00
ibuler f17001e86c fix comment 2015-12-21 11:12:52 +08:00
ibuler 7113852cd6 update README 2015-12-21 10:25:51 +08:00
ibuler 7d85c0393f fix readme 2015-12-20 21:20:08 +08:00
ibuler 48af55adab 添加readline 2015-12-20 19:30:42 +08:00
ibuler c36267dc17 rebase version 2015-12-20 19:09:18 +08:00
ibuler b7eb95f85f 修复安装bug 2015-12-20 17:45:57 +08:00
ibuler 08cbaa1622 fix sudo bug 2015-12-20 00:30:31 +08:00
ibuler a73fa7811c Merge branch 'dev' 2015-12-19 22:52:16 +08:00
wangyong 0d5fa418af Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev 2015-12-19 22:49:46 +08:00
wangyong cf59ebf1aa fix asset add batch bug 2015-12-19 22:49:39 +08:00
ibuler 52566cb562 modify service.sh 2015-12-19 22:08:56 +08:00
ibuler 75b307105b fix 2015-12-19 22:00:54 +08:00
ibuler 998281d86d Merge branch 'dev' of git.coding.net:jumpserver/jumpserver 2015-12-19 21:57:15 +08:00
ibuler 8494989715 修改install 2015-12-19 21:56:42 +08:00
jumpserver b73527fb33 update jumpserver.conf 2015-12-19 21:39:56 +08:00
ibuler f18c68b8ba Update jumpserver.conf 2015-12-19 21:38:23 +08:00
ibuler c8c0366b39 Merge with dev 2015-12-19 21:14:16 +08:00
ibuler 22c90eecfc 修改安装脚本 2015-12-19 21:12:47 +08:00
ibuler 3695989866 fix install bug 2015-12-19 20:31:06 +08:00
ibuler 80c5acef81 Merge branch 'dev' 2015-12-19 17:57:51 +08:00
ibuler 2cb6a1aac0 merge with github master 2015-12-19 17:46:30 +08:00