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

1490 Commits (f331b4471fe445a1fe2214c1a2e655fc7140cac0)

Author SHA1 Message Date
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
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
liuzheng712 8adf1c5d71 requirement 2016-03-15 15:11:33 +08:00
liuzheng712 5f35b740df test 2016-03-15 15:06:37 +08:00
liuzheng712 b0d1dd9485 test 2016-03-15 15:04:15 +08:00
liuzheng712 ade8fb927c test 2016-03-15 15:02:16 +08:00
liuzheng712 31708c0d24 udpate 2016-03-15 14:53:30 +08:00
liuzheng712 9b3a51469e install_chardet 2016-03-15 14:46:25 +08:00
yumaojun cdd31227b7 fix (jasset): 　修复连接超时，以及freebsd无法更新硬件信息 
1. 超时原因应该是sshd　的配置引起的，当前bsd的更新　相对于其他发行版　慢，这个原因估计的bsd自身有关
 2. ansible 的setup模块对于b sd获取的字段　越有偏差，而且无法获取硬盘信息，这个后期可以　提交patch 给ansible的setup模块。

 close #80
 2016-03-14 22:47:33 +08:00
ibuler 6b39c9946b Merge pull request #116 from jumpserver/bug_fix_guang 
fix(bug) 修复首页点击头像404问题
 2016-03-06 09:51:31 +08:00
ibuler 3a71d7f1a8 fix(bug) 修复首页点击头像404问题 
处理结果，直接干掉连接
 2016-03-06 09:50:01 +08:00
liuzheng712 d48020a919 test 2016-03-04 23:59:18 +08:00
liuzheng712 210b3c8588 test 2016-03-04 23:57:39 +08:00
liuzheng712 bdf6d97478 test 2016-03-04 23:50:19 +08:00
liuzheng712 1ac9bebb8d fix: delete monkey patch 2016-03-04 23:17:19 +08:00
liuzheng712 ef3156e6f7 fix(test): monkey patch 2016-03-04 23:15:39 +08:00
liuzheng712 95a7557acf fix: 2016-03-04 20:42:08 +08:00
liuzheng712 8e30ffb840 fix(run_server.py): test if it invoke_shell bug 2016-03-04 20:40:37 +08:00
liuzheng712 20b5facc38 fix(webterminal): data 2016-03-04 20:30:58 +08:00
liuzheng712 f7eda41a54 fix(webterminal): data.data.data 2016-03-04 20:29:54 +08:00
liuzheng712 6a0edb63f0 fix(webterminal): data.data 2016-03-04 20:28:52 +08:00
liuzheng712 e7976e4235 fix(webterminal.js): }) bug 2016-03-04 20:22:46 +08:00
liuzheng712 2bd3fdb4e7 fix(webterminal): url bug 2016-03-04 20:21:20 +08:00
liuzheng712 94a4d68be2 fix(webterminal.js): send bug 2016-03-04 20:12:09 +08:00
liuzheng712 b879e724e2 fix(webterminal.js): forget rowHeight and colWidth 2016-03-04 20:09:05 +08:00
liuzheng712 234f79857c fix(webterminal): change it to HTML5 websocket 2016-03-04 20:07:05 +08:00
liuzheng712 f73d34b9cc fix(monitor): change monitor url 2016-03-04 19:48:52 +08:00
liuzheng712 936faad1b9 fix(base.jinja2): change script with term.js 2016-03-04 19:35:53 +08:00
ibuler 649783d2c3 Merge pull request #114 from jumpserver/bug_fix_guang 
change(with pre fix) 修改安装和jumpserver.conf
 2016-03-03 18:18:36 +08:00
ibuler c0bacb7c7c change(with pre fix) 修改安装和jumpserver.conf 
上次修改已可以自动获取 ws地址，去掉无用设置和配置文件指定
去掉install.py中的设置
 2016-03-03 18:16:11 +08:00
ibuler 6436fab837 Merge pull request #113 from jumpserver/bug_fix_guang 
fix(ws protocal): 修复所有ws自动获取
 2016-03-03 18:09:26 +08:00
ibuler e38620a2a2 Merge pull request #111 from jumpserver/install_bug_fix 
修复一些install.py 中的小问题
 2016-03-03 18:08:04 +08:00
ibuler 702b1bd3b7 fix(ws protocal): 修复所有ws自动获取 
自动获取websocket无需再手动指定
 2016-03-03 18:05:10 +08:00
ibuler c2c833f279 Merge pull request #112 from jumpserver/issue_110_bugfix 
修复webterminal vim后命令double
 2016-03-03 17:21:42 +08:00
liuzheng712 a816a7b149 fix(webterminal): bug fix test 2016-03-03 17:03:47 +08:00
liuzheng712 32519f8eae fix: 2016-03-03 16:50:49 +08:00
liuzheng712 dbb4904513 fix(webterminal): test 2016-03-03 16:41:41 +08:00
liuzheng712 0e7a8c1a62 fix(webterminal): test 2016-03-03 16:39:14 +08:00
yumaojun 68582ca466 fix (install.py): 　修复lockfile 创建失败问题 2016-03-03 16:37:12 +08:00
liuzheng712 b1f0297e82 fix(web terminal): test 2016-03-03 16:35:48 +08:00