github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
3,119 Commits
64 Branches
246 Tags
105 MiB
Commit Graph

3119 Commits (c8c0479ce5e365f1599d2566bd1072f411f8d404)

Author SHA1 Message Date
ibuler ecfaf9f02d modify(jperm) 授权列表模糊搜索 (#225) 
修改授权规则搜索为模糊搜索
 2016-05-09 18:54:33 +08:00
ibuler d05e9d0b45 modify(jperm) 授权列表模糊搜索 
修改授权规则搜索为模糊搜索
 2016-05-09 18:53:04 +08:00
ibuler d4385c7e43 Merge branch 'master' into dev 2016-04-28 15:56:22 +08:00
ibuler 04fc9962ff Merge branch 'dev' 2016-04-28 15:55:08 +08:00
ibuler 2fd68845ce Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2016-04-28 15:54:33 +08:00
yumaojun03 bd69339e22 Bug fix hostname (#216) 
* fix (jasset):   修复资产hostname过长和密码过长引起的bug

1. 修改password字段的长度，对称加密过后的字符串会变长，所有设置得比较大(256)
2. 添加check hostname 和 password的 长度校验

* fix (jumpserver/jasset):   修复setting时，秘密过长问题。

1. 修改password字段的长度，对称加密过后的字符串会变长，所有设置得比较大(256)
2. 后端修复views秘密超过30位不保存
3.前段使用js限制秘密长多不能超过30位

* fix (jumpserver/jasset):   setting and asset hostname password  too long.

1. 添加setting password字段长度验证
2. 添加资产主机名和密码长度验证

* fix (jumpserver/jasset):   setting and asset hostname password  too long.

1. 修正setting时的　输入密码的提示错误.
 2016-04-28 15:44:48 +08:00
liuzheng c6404f7ed6 Static bug (#208) 
* 紧急修复下载文件后静态文件404问题

* 紧急修复监控白屏问题

* 紧急修复下载文件后静态文件404问题

* 紧急修复下载文件后静态文件404问题

* 修复zip包为空问题
 2016-04-24 20:42:02 +08:00
huangguozhen 6ce948366d Update base.html (#213) 
fix(frontend): use webkit default in multi kernel browsers
 2016-04-23 10:35:28 +08:00
ibuler 9e78fd3651 Merge master to dev (#212) 
* Update install.py

修改centos7支持

* Update install.py

* Support resize web terminal size

Support resize web terminal size.

Change new windows to a new tab.
May be more hommization

* Static bug (#204)

* 紧急修复下载文件后静态文件404问题

* 紧急修复监控白屏问题

* bugfix(upload web) When download file, static file will unreachable.

Didn't change dir

fixed

* bugfix(upload web) When download file, static file will unreachable. (#206) (#207)

* Update install.py

修改centos7支持

* Update install.py

* Support resize web terminal size

Support resize web terminal size.

Change new windows to a new tab.
May be more hommization

* Static bug (#204)

* 紧急修复下载文件后静态文件404问题

* 紧急修复监控白屏问题

* bugfix(upload web) When download file, static file will unreachable.

Didn't change dir

fixed

* fix bug index out of range (#210)
 2016-04-22 11:51:36 +08:00
kelianchun 5afd135967 fix bug index out of range (#210) 2016-04-22 11:49:50 +08:00
ibuler d5aa9324fa Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2016-04-21 18:12:58 +08:00
ibuler 9096a6e5b8 bugfix(upload web) When download file, static file will unreachable. (#206) (#207) 
* Update install.py

修改centos7支持

* Update install.py

* Support resize web terminal size

Support resize web terminal size.

Change new windows to a new tab.
May be more hommization

* Static bug (#204)

* 紧急修复下载文件后静态文件404问题

* 紧急修复监控白屏问题

* bugfix(upload web) When download file, static file will unreachable.

Didn't change dir

fixed
 2016-04-20 15:21:55 +08:00
ibuler cb58012a82 bugfix(upload web) When download file, static file will unreachable. (#206) 
* Update install.py

修改centos7支持

* Update install.py

* Support resize web terminal size

Support resize web terminal size.

Change new windows to a new tab.
May be more hommization

* Static bug (#204)

* 紧急修复下载文件后静态文件404问题

* 紧急修复监控白屏问题

* bugfix(upload web) When download file, static file will unreachable.

Didn't change dir

fixed
 2016-04-20 15:20:11 +08:00
ibuler 58bb3cc84f Merge branch 'dev' 
fix download error

static file lost
 2016-04-20 15:17:04 +08:00
ibuler c2ff05201a Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2016-04-20 14:44:06 +08:00
yumaojun03 9be13cf08f fix (jperm): 修复密码添加和更新 role时 密码过长引起的bug (#202) 
1. 修改password字段的长度，对称加密过后的字符串会变长，所有设置得比较大(512)
2. 修改后端检查密码长度，并触发异常。
 2016-04-20 14:31:52 +08:00
ibuler eb4ec47f7a bugfix(upload web) When download file, static file will unreachable. 
Didn't change dir

fixed
 2016-04-20 14:29:11 +08:00
liuzheng e2eb9b72f8 Static bug (#204) 
* 紧急修复下载文件后静态文件404问题

* 紧急修复监控白屏问题
 2016-04-20 13:08:26 +08:00
ibuler c9ff235089 fix(connect) input exact ip for connect 
modify search strategy

if some ip match pass
 2016-04-16 16:27:15 +08:00
ibuler 9af809a4f0 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2016-04-12 11:12:32 +08:00
Astraeux 288a42663a TTY nav sort by ip / hostname / none (#198) 
* TTY nav sort by ip / hostname / none

* add newline at end of file
 2016-04-12 11:11:19 +08:00
liuzheng cca15d4211 Support resize web terminal size 
Support resize web terminal size.

Change new windows to a new tab.
May be more hommization
 2016-04-07 15:45:48 +08:00
jiaxiangkong fe2081b407 Update install.py 2016-04-07 15:07:03 +08:00
ibuler fa323d4987 Update install.py 
修改centos7支持
 2016-04-07 11:56:00 +08:00
ibuler eeef4a2f95 Merge branch 'windowResize' of github.com:jumpserver/jumpserver into windowResize 2016-04-06 13:04:47 +08:00
liuzheng712 2e49f51093 update 2016-04-06 12:58:00 +08:00
ibuler 0481e83ec4 Merge branch 'dev' into windowResize 2016-04-06 12:57:54 +08:00
liuzheng712 ff8b5bd6c0 默认terminal100x35 2016-04-06 10:26:30 +08:00
liuzheng712 aabab653d3 默认terminal大小100x35 2016-04-06 10:24:18 +08:00
ibuler efe0b3acc0 Fix nav info and delete user key when delete a user 
Fix nav info and delete user key when delete a user

reviewd by ibuler <ibuler@qq.com>
 2016-04-05 23:47:27 +08:00
ibuler 35cc966132 change(info) Modify some nav info 
May be clearly.
 2016-04-05 23:44:01 +08:00
ibuler 777997202b patch again with 1f09a40c77 
print => debug
 2016-04-05 22:37:55 +08:00
ibuler 1f09a40c77 fix(user manage and connect first login) 
When delete a user, but didn't delete the user sysuser key. When create
a user with same username, error occur.

When user login tty, and type a num first, it will search a host, but
login the asset with the id.

fixed
 2016-04-05 22:34:37 +08:00
ibuler d20fecadac Merge branch 'dev' 2016-04-05 16:53:06 +08:00
ibuler fa430bf104 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2016-04-05 16:52:44 +08:00
ibuler 8bb66ac254 fix(install.py) delete old pycrypto module 
fixed
 2016-04-05 16:51:58 +08:00
liuzheng712 6518aa3670 bugfix 2016-04-05 13:05:07 +08:00
liuzheng712 c76d9ebd88 bugfix 2016-04-05 12:56:37 +08:00
liuzheng712 7f4d3ffdbc bug_fix 2016-04-05 12:54:37 +08:00
liuzheng712 b908fdafc6 udpate 2016-04-05 12:50:09 +08:00
liuzheng712 ef59cff44b bug_fix 2016-04-05 12:42:44 +08:00
ibuler f511802db5 fix asset group judge 
reviewed by: ibuler <ibuler@qq.com>
 2016-04-05 11:22:31 +08:00
ibuler 30c74b8427 Merge pull request #192 from jumpserver/group_judge 
new feature (connect) Ignore case in searching
 2016-04-05 11:19:55 +08:00
ibuler 2dd16b91ec Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2016-04-05 11:18:54 +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 1959c685b9 new feature (connect) Ignore case in searching 
finshed
 2016-04-01 17:52:47 +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