github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
1,529 Commits
68 Branches
249 Tags
110 MiB
Commit Graph

1529 Commits (3dfd9cd51243ad95473349480f721e45a0f5d406)

Author SHA1 Message Date
kelianchun 3dfd9cd512 Merge pull request #165 from kelianchun/dev 
pull issue #120  remove ps1
 2016-03-26 08:50:21 +08:00
kelianchun_miller 6a51bd1a1c pull issue #120 remove ps1 2016-03-26 00:01:48 +08:00
kelianchun d86cebf99a Merge pull request #164 from kelianchun/dev 
pull issue #120  remove ps1
 2016-03-25 23:55:26 +08:00
kelianchun_miller fd713e0e5c pull issue #120 remove ps1 2016-03-25 21:08:52 +08:00
ibuler 4f79e909e5 Merge pull request #161 from jumpserver/user_edit 
fix(user edit) 修改用户导致密码问题
 2016-03-25 17:20:21 +08:00
ibuler 69061791ed fix(user edit) 修改用户导致密码问题 
简单修改，更改结构和变量名

close #160
 2016-03-25 17:18:41 +08:00
ibuler 38f15c976f Merge pull request #159 from jumpserver/terminal_font 
fix(web terminal) Windows 浏览器使用chrome -换行
 2016-03-24 19:07:55 +08:00
ibuler b745ebdda1 fix(web terminal) Windows 浏览器使用chrome -换行 
经测试由于字体原因，可以安装Monaco字体解决，然而不太方便

添加第二字体为 微软雅黑，经测试解决

fixed
close #158
 2016-03-24 19:03:20 +08:00
ibuler ae58fd548f Merge pull request #157 from jumpserver/force_del_user 
fix(userdel) 修复无法删除在线用户bug
 2016-03-24 18:07:28 +08:00
ibuler fbc3078c07 fix(userdel) 修复无法删除在线用户bug 
当用户已经登录到jumpserver时，web上删除用户时失败，也没有提示

修改方法: userdel -r -f 强制删除

close #156
 2016-03-24 18:04:04 +08:00
kelianchun 5587ff59b0 Merge pull request #155 from kelianchun/dev 
Dev
 2016-03-24 13:35:46 +08:00
kelianchun 6d329b130a remove ps1 search 
remove ps1 search
 2016-03-24 13:02:02 +08:00
ibuler 6d302eb25a Merge pull request #154 from jumpserver/term_log_bug 
fix: command recoder bug fix
 2016-03-23 17:07:28 +08:00
kelianchun db72048c31 Update run_server.py 2016-03-23 15:47:08 +08:00
liuzheng712 f1ff52eb6b fix: command recoder bug fix 2016-03-23 15:46:42 +08:00
ibuler 0b05899818 Merge pull request #152 from jumpserver/pyte 
change(install.py) 增加pyte库
 2016-03-23 15:12:07 +08:00
ibuler bd59b6316e change(install.py) 增加pyte库 
增加pyte库来分析命令
 2016-03-23 15:10:28 +08:00
kelianchun dc2ea0d6bf Merge pull request #149 from kelianchun/dev 
Dev
 2016-03-23 12:40:06 +08:00
kelianchun 73382cbcfb Update run_server.py 2016-03-23 12:37:55 +08:00
kelianchun e6254ddc2c deal command data 
deal command data
 2016-03-23 12:36:29 +08:00
kelianchun 30607730f2 Merge pull request #148 from kelianchun/dev 
no command data
 2016-03-23 12:29:38 +08:00
kelianchun b92c5188d1 no command data 
no command data
 2016-03-23 12:28:32 +08:00
ibuler 524cd1d990 Merge pull request #147 from jumpserver/bug_asset_upload_01 
fix asset upload bug
 2016-03-23 12:09:20 +08:00
wangyong 231f961945 fix asset upload bug 2016-03-23 11:56:32 +08:00
ibuler 300e106143 Merge pull request #140 from Astraeux/smtp_ssl_fix 
SMTP发邮件支持SSL
 2016-03-22 16:32:51 +08:00
ibuler 57e85affde Merge pull request #141 from jumpserver/termShake 
fix: when moniter the terminal, fix the shake
 2016-03-22 10:22:42 +08:00
liuzheng712 34b74b9e4e fix: when moniter the terminal, fix the shake 2016-03-21 22:51:28 +08:00
Astraeux c218949556 SMTP发邮件支持SSL 2016-03-21 21:55:03 +08:00
Astraeux 4b90cd9b82 Merge pull request #3 from jumpserver/dev 
update from origin
 2016-03-21 20:08:34 +08:00
ibuler fcb3fd7186 Merge pull request #139 from jumpserver/issue_52_bugfix 
Issue 52 bugfix: 修复录像播放，web terminal hang住bug
 2016-03-21 11:11:21 +08:00
ibuler b6af8368b6 Merge pull request #138 from jumpserver/role_pass_long_bug 
修复系统用户role密码过长引起的异常
 2016-03-21 10:40:59 +08:00
ibuler 6e4b291808 fix(perm_role_edit) 修复编辑系统用户密码过长bug 
1. 添加前端验证

close #173
 2016-03-21 10:32:08 +08:00
ibuler 4c88ea3c05 fix(perm_role_add) 修复添加系统用户密码过长导致的异常bug 
1. 修改表结构password长度
2. 修改template添加js验证
 2016-03-21 10:30:29 +08:00
ibuler 0e5fd68e6c Merge pull request #129 from jumpserver/bug_fix_100_and_127 
fix (jperm):   统一调整系统用户 仅使用秘钥进行通信， 已存在的用户不会修改密码
 2016-03-19 13:18:06 +08:00
liuzheng712 1103ee8f52 len(vim_data) 2016-03-18 23:55:06 +08:00
liuzheng712 9efa9e979c len(vim_data) 2016-03-18 23:51:25 +08:00
liuzheng712 f331b4471f Merge branch 'dev' of github.com:jumpserver/jumpserver into issue_52_bugfix 2016-03-18 23:41:19 +08:00
kelianchun f11016f57c Merge pull request #136 from kelianchun/dev 
pull issue #120
 2016-03-18 23:38:26 +08:00
Astraeux 4b53bae57b Merge pull request #1 from jumpserver/dev 
update from origin
 2016-03-18 23:37:22 +08:00
kelianchun_miller b2ccbc3f9e pull issue #120 2016-03-18 23:36:31 +08:00
kelianchun_miller 7dcf050dc4 pull issue #120 2016-03-18 22:06:40 +08:00
kelianchun_miller 717869fd30 Merge remote-tracking branch 'remotes/origin/master' into dev 2016-03-18 22:04:12 +08:00
kelianchun_miller 598d6cffa4 pull issue #120 2016-03-18 20:43:25 +08:00
liuzheng712 c022c81100 Merge branch 'dev' of github.com:jumpserver/jumpserver into issue_52_bugfix 2016-03-18 17:32:46 +08:00
liuzheng712 5af9dd655e delete_require_chardet 2016-03-18 17:08:15 +08:00
ibuler abdf9c72ca Merge pull request #122 from jumpserver/bug_fix_80 
fix (jasset): 　修复连接超时，以及freebsd无法更新硬件信息
 2016-03-18 17:00:09 +08:00
ibuler 3778724b73 Merge pull request #134 from kelianchun/dev 
修复命令截取bug
 2016-03-18 16:46:02 +08:00
kelianchun d76865c1ed pull issue #120 
修复了命令处理的bug
 2016-03-18 15:38:31 +08:00
liuzheng712 3ccf7adac1 终于修复了乱码啦啦啦 2016-03-18 15:01:07 +08:00
yumaojun c0e8ff8620 fix (jperm): 统一调整系统用户 仅使用秘钥进行通信， 已存在的用户不会修改密码 
1. perm_role_add 同上 保留 密码选项
2. perm_role_edit 同上 保留 密码选项
3. 仅保持入数据，不设计远程操作

close #100
close #127
 2016-03-16 23:03:43 +08:00