github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
1,699 Commits
87 Branches
259 Tags
138 MiB
Commit Graph

1699 Commits (1614dd5a4d3189ab2bea5ede7e41d23af1f28fab)

Author SHA1 Message Date
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
liuzheng712 8cd6d23ff2 update 2016-03-28 20:24:02 +08:00
liuzheng712 f3d863ea45 filename 2016-03-28 20:19:49 +08:00
liuzheng712 958909551d bug_fix 2016-03-28 20:09:51 +08:00
liuzheng712 b132a0c0b5 use_old_way 2016-03-28 20:06:05 +08:00
ibuler 6e7e4d4742 Merge pull request #169 from jumpserver/new-line- 
New line
 2016-03-28 19:16:48 +08:00
ibuler c95c76d0e0 change(web terminal) 修复web terminal遇到-换行 
添加css

	white-space: nowrap;
        display: inline-block;

之前通过修改字体解决
 2016-03-28 19:14:45 +08:00
ibuler 8735af4cbb fix(monitor) 修复监控-换行 
修复实时监控-导致的换行，添加css

  .terminal {
      white-space: nowrap;
      display: inline-block;
  }
 2016-03-28 19:11:56 +08:00
liuzheng712 edfef5822f bug fix 2016-03-27 22:58:59 +08:00
liuzheng712 ebef54ca44 Merge branch 'TermLogRecorder' of github.com:jumpserver/jumpserver into TermLogRecorder 2016-03-27 22:30:04 +08:00
liuzheng712 c937abe098 bugfix 2016-03-27 22:29:39 +08:00
liuzheng712 587c9b2c3f bugfix 2016-03-27 22:20:20 +08:00
kelianchun 74ac1dc06b Merge pull request #167 from kelianchun/TermLogRecorder 
connect.py use TermLog
 2016-03-27 22:00:59 +08:00
kelianchun_miller 0707b68796 connect.py use TermLog 2016-03-27 22:00:00 +08:00
liuzheng712 445a83f78a remove this log in loglist 2016-03-27 12:17:02 +08:00
liuzheng712 bc1d89da89 here I didn't use int to record the dict , changed 2016-03-27 11:13:15 +08:00
liuzheng712 dc5751951e disuse pyinotify, use TermLogRecord to record the log and monitor 2016-03-27 11:11:50 +08:00
ibuler 3ca6629175 Merge pull request #166 from jumpserver/font_size 
change(font) 修改使用websocket的页面字体,增加监控size
 2016-03-26 11:42:12 +08:00
ibuler 1e1aa67b3e change(font) 修改使用websocket的页面字体,增加监控size 
增加 "Microsoft Yahei"
 2016-03-26 11:39:49 +08:00
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
liuzheng712 5e329f51a4 Merge branch 'dev' of github.com:jumpserver/jumpserver into TermLogRecorder 2016-03-25 23:58:04 +08:00
kelianchun d86cebf99a Merge pull request #164 from kelianchun/dev 
pull issue #120  remove ps1
 2016-03-25 23:55:26 +08:00
liuzheng712 9b43c6c238 update 2016-03-25 23:52:48 +08:00
liuzheng712 1084be4712 update 2016-03-25 22:28:49 +08:00
liuzheng712 44b2bcb759 修改日志数据库部分 2016-03-25 22:24:56 +08:00
liuzheng712 2d1e001ddf 日志回放ok 2016-03-25 22:20:50 +08:00
liuzheng712 8e8d8c9d6a 日志回放OK 2016-03-25 22:19:31 +08:00