github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
1,626 Commits
72 Branches
250 Tags
115 MiB
Commit Graph

1626 Commits (b908fdafc6c89feee9511e01250be1a0dcda0ee3)

Author SHA1 Message Date
liuzheng712 b908fdafc6 udpate 2016-04-05 12:50:09 +08:00
liuzheng712 ef59cff44b bug_fix 2016-04-05 12:42:44 +08:00
liuzheng712 bb7a3ea053 Merge branch 'master' of github.com:jumpserver/jumpserver 2016-04-05 10:53:47 +08:00
liuzheng712 0499a7265a 手动修改窗口大小问题 2016-04-05 10:53:35 +08:00
ibuler cd80fbcdbb Merge pull request #190 from jumpserver/dev 
Dev
 2016-04-01 17:24:45 +08:00
ibuler 5814b833ed Merge pull request #189 from jumpserver/webexec_log 
Webexec log
 2016-04-01 16:44:35 +08:00
ibuler cda0b9c90a fix(web exec) Web execute command log didn't get the real ip if behind the lb proxy. 
fixed
 2016-04-01 16:42:01 +08:00
ibuler 609bba569e fix(web exec) Web execute command log didn't get the real ip if behind the lb proxy. 
fixed
 2016-04-01 16:40:53 +08:00
ibuler 77c7f8fb54 fix(web exec) Web execute command log didn't get the real ip if behind the lb proxy. 
fixed
 2016-04-01 16:38:37 +08:00
ibuler f65290ef38 Merge pull request #188 from jumpserver/dev 
新增功能
 2016-04-01 13:49:28 +08:00
ibuler de594aebd5 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2016-04-01 12:12:34 +08:00
ibuler 2be81c0322 fix(connect) delete debug 
fixed
 2016-04-01 12:11:31 +08:00
ibuler e902fccd39 Merge pull request #187 from jumpserver/search_sort 
feat (sort search) 对搜索结果排序
 2016-04-01 11:54:28 +08:00
ibuler 61d162312f Merge pull request #185 from Astraeux/support_amazon_linux 
支持 Amazon Linux
 2016-04-01 11:53:55 +08:00
ibuler 30a3cd2911 feat (sort search) 对搜索结果排序 
tty登陆连接，搜索时对结果进行排序

finished
 2016-04-01 11:50:35 +08:00
ibuler 2dfe9337a2 Merge pull request #186 from jumpserver/conn_search 
fix(connect) 增加模糊搜索
 2016-03-31 23:50:37 +08:00
ibuler c188696328 fix(connect) 增加模糊搜索 
之前只是输入id登陆，增加了模糊搜索登陆

如果搜索唯一则登陆
 2016-03-31 23:45:01 +08:00
Astraeux f8fac06e1b 支持 Amazon Linux 2016-03-31 15:14:41 +08:00
ibuler edad26e05b Merge pull request #183 from jumpserver/connect_slow 
fix(connect) 修复paramiko连接速度特么慢问题
 2016-03-31 00:16:18 +08:00
ibuler 6c8117045f fix(connect) 修复paramiko连接速度特么慢问题 
导致的原因是 pycrypto库有问题

fixed
 2016-03-31 00:14:46 +08:00
ibuler b573170d69 Merge pull request #182 from jumpserver/web_width 
fix(web terminal) 修改web terminal初始窗口大小
 2016-03-30 22:25:35 +08:00
ibuler 1d14f08541 fix(web terminal) 修改web terminal初始窗口大小 
代码缺陷，没有复用
 2016-03-30 22:22:43 +08:00
ibuler 489d796d7b Merge pull request #180 from jumpserver/bugfix 
修复日志回放问题
 2016-03-29 23:52:19 +08:00
liuzheng712 1efede4de8 bugfix 2016-03-29 21:37:56 +08:00
liuzheng712 a1187757bc bugfix 2016-03-29 21:22:18 +08:00
liuzheng712 263ff1ee08 bugfix 2016-03-29 21:18:04 +08:00
liuzheng712 2f2289a863 bugfix 2016-03-29 21:16:30 +08:00
liuzheng712 e07305ef46 bugfix 2016-03-29 21:06:46 +08:00
liuzheng712 1c61ed6a8b bugfix 2016-03-29 21:05:29 +08:00
liuzheng712 cf1da2a420 bugfix 2016-03-29 20:56:19 +08:00
liuzheng712 7de03c0fc7 Merge branch 'master' of github.com:jumpserver/jumpserver 2016-03-29 20:44:45 +08:00
liuzheng712 9c38f39e5b 紧急修复监控白屏问题 2016-03-29 17:20:05 +08:00
ibuler 0937e64c2e Merge pull request #178 from jumpserver/dev 
Fix a bug for get_log function 

hot fix
 2016-03-29 17:18:46 +08:00
ibuler 5a6e0283dd Merge branch 'master' into dev 2016-03-29 17:17:54 +08:00
ibuler 5489797900 Merge branch 'dev' 2016-03-29 17:17:03 +08:00
liuzheng712 6e48fe6357 紧急修复监控白屏问题 2016-03-29 17:16:26 +08:00
ibuler 485b45675d Merge pull request #177 from jumpserver/fixed_log 
fix(log) fix load_full_log function bug
 2016-03-29 17:14:15 +08:00
ibuler d31f882f1a fix(log) fix load_full_log function bug 
fixed
 2016-03-29 17:11:56 +08:00
ibuler 209c078614 Merge pull request #176 from jumpserver/merge_master 
Merge with master
 2016-03-29 15:39:46 +08:00
ibuler d2b4594bc2 Merge branch 'master' into dev 2016-03-29 15:38:28 +08:00
ibuler 6fcfb385cd Update README.md 2016-03-29 14:07:44 +08:00
ibuler b12b83cbb5 Update requirements.txt 2016-03-29 14:07:14 +08:00
ibuler 26804b4093 Merge pull request #174 from jumpserver/dev 
Release 0.3.1 version, Fix most bugs
 2016-03-29 11:33:05 +08:00
ibuler 8ebcd47599 Merge pull request #173 from jumpserver/version_num 
change(version num) change jumpserver version
 2016-03-28 23:38:42 +08:00
ibuler d810a082c5 change(version num) change jumpserver version 
from 0.3.0 -> 0.3.1
 2016-03-28 23:37:32 +08:00
ibuler 2f9255a46f Merge pull request #172 from jumpserver/web_log 
fix(web terminal and log kill) fix close web terminal when not init finished
 2016-03-28 23:09:37 +08:00
ibuler 5d0171d5b7 fix(web terminal and log kill) fix close web terminal when not init finished 
when web terminal not init complete, you close the window, online log you will see the log and cann't kill it

catch a except fix it
 2016-03-28 23:04:30 +08:00
ibuler c5382c88a2 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2016-03-28 22:59:35 +08:00
ibuler 98f9e632ac Merge pull request #170 from jumpserver/TermLogRecorder 
Term log recorder, 需要数据库增加filename字段
 2016-03-28 22:59:06 +08:00
ibuler f912869de6 fix(web monitor) 修改监控特殊编码卡住 
编码字符，强制utf-8
 2016-03-28 22:00:48 +08:00