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

1568 Commits (98f9e632ac332167a325c0335243eab73ccb91f6)

Author SHA1 Message Date
ibuler 98f9e632ac Merge pull request #170 from jumpserver/TermLogRecorder 
Term log recorder, 需要数据库增加filename字段
 2016-03-28 22:59:06 +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
liuzheng712 a1862d912a Merge branch 'dev' of github.com:jumpserver/jumpserver into TermLogRecorder 2016-03-25 21:08:55 +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
liuzheng712 860c7f1508 Merge branch 'dev' of github.com:jumpserver/jumpserver into TermLogRecorder 2016-03-24 17:29:59 +08:00
liuzheng712 3fcd9589a4 update 2016-03-24 17:29:50 +08:00
liuzheng712 ba5e90abc3 update 2016-03-24 17:17:47 +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
liuzheng712 357aea1693 update jumpserver.conf only for myself 2016-03-24 12:49:39 +08:00
liuzheng712 3ab0c94496 update settings for myself, use sqlite 2016-03-24 12:49:06 +08:00
liuzheng712 b3f83c3362 update 2016-03-23 22:38:02 +08:00
liuzheng712 17a7470a2a update_TermLogRecorder 2016-03-23 18:26:23 +08:00
liuzheng712 365a5ccd46 update_TermLogRecorder 2016-03-23 18:25:18 +08:00
liuzheng712 742a2b1b85 Merge branch 'dev' of github.com:jumpserver/jumpserver into TermLogRecorder 2016-03-23 17:08:33 +08:00
liuzheng712 388ebe3bee update 2016-03-23 17:07:57 +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
liuzheng712 fa1f2404d9 日志记录 2016-03-23 17:05:35 +08:00