github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
1,587 Commits
64 Branches
246 Tags
105 MiB
Commit Graph

95 Commits (6e48fe63579da5cb17f169a21833a9d0e150c059)

Author SHA1 Message Date
liuzheng712 357aea1693 update jumpserver.conf only for myself 2016-03-24 12:49:39 +08:00
Astraeux c218949556 SMTP发邮件支持SSL 2016-03-21 21:55:03 +08:00
yumaojun ca75484eb8 fix (jperm): 统一调整系统用户 仅使用秘钥进行通信， 已存在的用户不会修改密码 
1. perm_role_push 模板取消密码选项，但是为了 那么留下秘钥推送可勾选，允许空推送
2. perm_role_add 同上 取消 密码选项
3. perm_role_edit 同上 取消 密码选项
4. views 调整role push add edit 相关视图
5. perm_api，调整 gen_resource，仅支持秘钥认证（是否需要支持密码认证，我觉得没必要，如果需要请提出)

close #100
close #127
 2016-03-16 22:30:39 +08:00
ibuler c0bacb7c7c change(with pre fix) 修改安装和jumpserver.conf 
上次修改已可以自动获取 ws地址，去掉无用设置和配置文件指定
去掉install.py中的设置
 2016-03-03 18:16:11 +08:00
ibuler cba53bba55 modify(jumpserver.conf) 修改jumpserver.conf默认配置 
django和tornado统一入口后，配置默认启动端口80
websocket和web都使用该端口
 2016-02-29 10:25:59 +08:00
ibuler 532fbbd4f1 change(service.sh, run_websocket) 修改启动脚本, rename run_websocket.py 
1. 修改启动脚本，支持放到 init.d
2. rename run_websocket.py -> run_server.py 交互式启动
 2016-02-27 01:26:36 +08:00
ibuler a8eb9f3e79 fix(jlog, websocket url) 修复ws使用 ws协议还是wss协议 
1. 不再需要浏览器判断什么协议，需要在jumpserver.conf注明

ref #63
 2016-02-27 00:19:04 +08:00
liuzheng712 d67aab573d fix: ip and port use jumpserver.conf to configure 2016-02-26 22:59:17 +08:00
ibuler 13d325e259 捕捉smtp异常 2015-12-22 17:18:53 +08:00
jumpserver b73527fb33 update jumpserver.conf 2015-12-19 21:39:56 +08:00
ibuler 0715e11c05 fix install bug 2015-12-18 18:35:07 +08:00
ibuler e817715da3 fix asset update bug 2015-12-15 17:35:02 +08:00
广宏伟 3260584f90 修改jumpserver.conf注释 2015-12-14 14:52:35 +08:00
ibuler 014d0935ba bug fix 2015-12-10 21:55:21 +08:00
yumaojun b0f2b346f9 修复了rule 和 role　的detail 页面 2015-12-10 17:44:45 +08:00
ibuler 52c4395b68 去掉runas 2015-11-29 16:56:39 +08:00
yumaojun b7d9e41b43 1. 修复角色推送 step3 失败 2015-11-28 22:54:59 +08:00
ibuler 2c0d42e0da fix some bug 2015-11-25 18:59:12 +08:00
wangyong 0262d94dd3 fix disk detail bug 2015-11-24 19:04:16 +08:00
ibuler 6b1b33481c 一些js, setting的KEY_DIR, 下载秘钥鉴定 2015-11-19 23:11:00 +08:00
yumaojun e5c1071073 Merge branch 'dev' into map_perm 2015-11-17 14:10:46 +08:00
ibuler ce02d430ba deal_command添加到静态方法中 2015-11-16 23:33:44 +08:00
ibuler 4abf2b06d8 添加jumpserver.conf 2015-11-16 23:11:37 +08:00
ibuler f0d901e136 修复分页bug 2015-11-16 18:34:51 +08:00
yumaojun 6da97c5403 merge dev ... 2015-11-15 23:30:37 +08:00
广宏伟 b8ae0ed565 some bug fix 2015-11-15 17:01:02 +08:00
ibuler 3b07198b8a merge with cmdb 2015-11-15 19:57:25 +08:00
yumaojun 0862ffef98 merge map 2015-11-15 08:39:43 +08:00
yumaojun 012950cb68 merge update... 2015-11-14 23:07:08 +08:00
ibuler 20970db404 修复环境变量大小写，修改terminal类 2015-11-13 21:15:41 +08:00
yumaojun 9ec2b9ff1d merge filed, update files... 2015-11-13 12:50:21 +08:00
ibuler 91b5d039cc 修改邮件settings 2015-11-09 16:28:10 +08:00
ibuler 98c4d9bdba web terminal kill方法 2015-11-07 15:27:49 +08:00
ibuler 9a897e0cf4 修正导入select错误 2015-11-05 20:07:21 +08:00
root 7d412e4c18 update configure file 2015-10-28 22:30:34 +08:00
wangyong 8909386d0c models 2015-10-27 20:13:23 +08:00
ibuler c21cdc2131 添加忘记密码 2015-08-31 23:04:53 +08:00
ibuler 44c69ded78 干掉ldap前 2015-08-30 14:03:10 +08:00
root 1e170714c0 修改用户添加视图 2015-08-29 00:09:36 +08:00
ibuler fc22677f3f modify some 2015-06-09 23:06:32 +08:00
ibuler 1662269153 websocket auth add 2015-05-28 17:00:03 +08:00
ibuler 58fd4374c7 Merge branch 'wangyong' 2015-05-15 12:01:51 +08:00
root 49bee0c3fd 修改主机添加或者修改没添加进ALL组bug 2015-05-14 18:02:20 +08:00
ibuler 311b65da00 ޸bug 2015-04-22 18:57:55 +08:00
ibuler 412dadce76 version 2.0.0 beta 2015-04-20 10:12:11 +08:00
ibuler e96053ba20 ޸ 2015-04-18 19:15:53 +08:00
ibuler 9ab855fd92 merge 2015-04-18 17:00:03 +08:00
ibuler c1d8de4558 ϲ 2015-04-18 16:58:16 +08:00
halcyon f19b274fcc bug 2015-04-18 16:58:15 +08:00
halcyon 84929840d0 bug 2015-04-18 13:51:47 +08:00