Commit Graph

11593 Commits

Author SHA1 Message Date
ibuler
38b0f2f5f9 Merge pull request #34 from t57root/forget_password_vul
当有用户uuid 或账号姓名电邮地址信息时,可以修改任意账号的密码
2016-01-04 15:05:31 +08:00
ParInshOvGotQuep
79300b752b 修复找回密码及静态key问题 2016-01-04 13:56:47 +08:00
yumaojun
ed6559bbe9 修改前端禁止root的正则表达式,做精确匹配 2016-01-04 13:17:58 +08:00
yumaojun
0821e7cf41 Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev 2016-01-04 13:13:35 +08:00
yumaojun
38f72a85e4 修改前端禁止root的正则表达式,做精确匹配 2016-01-04 13:13:13 +08:00
ibuler
ccc2bcf066 Merge branch 'dev' 2016-01-04 12:08:14 +08:00
ibuler
d9d009ab1f Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev 2016-01-04 12:08:02 +08:00
ibuler
f268af945f 修复web执行命令没有结果 2016-01-04 12:01:47 +08:00
yumaojun
34e8b32180 添加系统用户删除 提醒 2016-01-04 11:47:50 +08:00
yumaojun
c6626e83f2 禁止添加root用户作为系统用户 2016-01-04 11:43:17 +08:00
ibuler
4e5c501041 Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev 2016-01-03 22:03:26 +08:00
yumaojun
0832ea97b1 去除sudo 添加和修改是 空格会被识别为 分隔符的问题 2016-01-03 21:11:55 +08:00
ibuler
7bef517518 支持修改窗口大小 2016-01-01 22:38:50 +08:00
ibuler
ea973bbb52 修复交换机小bug 2015-12-31 22:37:01 +08:00
ibuler
b673fec532 添加失败点击提示 2015-12-31 19:12:17 +08:00
ibuler
7e185197aa Merge branch 'sh' 2015-12-31 16:42:21 +08:00
ibuler
5e86b06db8 添加调试 2015-12-31 16:41:52 +08:00
ibuler
2e2b065c42 Merge pull request #31 from t57root/modify-default-shell
修改普通用户默认shell为connect.py,修复jailbreak
2015-12-31 16:41:22 +08:00
ibuler
91e006cfb0 Merge branch 'sh1' into sh 2015-12-31 16:35:33 +08:00
ibuler
b1a36bbb11 fix 2015-12-31 16:35:17 +08:00
ParInshOvGotQuep
ac40098ac5 修改硬编码的shell路径 2015-12-31 16:24:46 +08:00
ibuler
6ff030847e Merge branch 'sh1' into sh 2015-12-31 16:18:50 +08:00
ibuler
a12e401f15 fix comment 2015-12-31 12:54:15 +08:00
ibuler
49f2f92a9c fix输入换行 2015-12-31 11:20:41 +08:00
ibuler
d1ac7ca647 Merge branch 'master' into dev 2015-12-31 10:20:08 +08:00
wangyong
f6c26a201e 修改硬盘不显示问题 2015-12-30 22:35:32 +08:00
ParInshOvGotQuep
90b875adae 修改普通用户默认shell为connect.py,修复jailbreak 2015-12-30 19:15:33 +08:00
ibuler
7be7772af6 修复授权修改显示ip 2015-12-30 15:38:28 +08:00
ibuler
2fa1d7a95b fix connect.py 字符报错 2015-12-30 12:36:34 +08:00
ibuler
6e747fa299 Merge branch 'master' of github.com:ibuler/jumpserver 2015-12-30 12:12:00 +08:00
ibuler
86cc963673 更换alert我layer 2015-12-30 12:11:39 +08:00
ibuler
e776c3c5f9 Update README.md 2015-12-29 22:54:55 +08:00
wangyong
33da9fd143 fix hostname unicode 2015-12-29 14:20:47 +08:00
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