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

735 Commits (b7bf6b4cc0be814450dcee87711a0e82a52ca5e2)

Author SHA1 Message Date
ibuler b7bf6b4cc0 Merge pull request #23 from hailwind/master 
add choose group to execute commands. 增加组执行命令功能
 2015-12-11 12:05:15 +08:00
Alex Wang 3f451158f0 add choose group to execute commands. 2015-11-30 15:15:05 +08:00
ibuler c00a55619c Update connect.py 
去掉compress
 2015-11-17 16:43:33 +08:00
蓝枫 9018536651 Merge pull request #21 from shadowzey/master 
页面错误修复
 2015-10-26 11:42:08 +08:00
zyan ec8ef4d1d7 Update idc_detail.html 
修复IDC详情页面显示错误
 2015-10-26 10:35:50 +08:00
shadowzey 64973e43de 修复从查看部门页面进入主机列表点击详情404错误 2015-10-13 17:19:47 +08:00
蓝枫 e284584506 Merge pull request #20 from shadowzey/master 
捕获添加用户邮箱填写错误时邮件发送失败的异常
 2015-10-13 16:55:13 +08:00
严泽 0667067c0c 捕获添加用户邮箱填写错误时邮件发送失败的异常 2015-10-13 16:36:16 +08:00
蓝枫 949065be2c Update connect.py 
修正vim颜色
 2015-10-01 16:25:17 +08:00
蓝枫 6168ab270f Merge pull request #19 from IYism/master 
bugfix：connect.py log_online.html
 2015-09-25 17:20:48 +08:00
IYism 667862223c bugfix 
修复chrome浏览器有时候不能阻断的bug
 2015-09-25 16:33:11 +08:00
IYism 2f5cf429ed bugfix ip_list 
bugfix ip_list
 2015-09-25 16:30:15 +08:00
蓝枫 a4ac98332b Merge pull request #15 from xiaopeng163/master 
Delete .DS_Store file
 2015-08-31 10:32:06 +08:00
Peng Xiao 073e7b36fa Delete .DS_Store file 
.DS_Store is the name of a file in the Apple OS X operating system for storing custom attributes of a folder such as the position of icons or the choice of a background image.
 2015-08-31 10:28:54 +08:00
ibuler f47cddbd5c 修改cpu占用问题 2015-08-28 10:04:07 +08:00
蓝枫 d34ec00a3a Merge pull request #14 from pengyao/master 
exact match， thanks for pengyao
 2015-08-26 16:12:36 +08:00
pengyao e9c6924530 exact match 2015-08-26 16:06:22 +08:00
蓝枫 a040b1c181 Update connect.py 
fix cpu used 100%
 2015-07-21 10:26:49 +08:00
蓝枫 8121e4942b Merge pull request #13 from ljjjustin/master 
fix error url in host search page
 2015-07-08 19:20:00 +08:00
Jiajun Liu f5e57da106 fix line break bug on add multiple hosts 2015-07-07 18:12:25 +08:00
Jiajun Liu b8dfb26a3a fix error url in host search page 2015-07-07 17:44:12 +08:00
蓝枫 079338f89d Merge pull request #12 from ljjjustin/master 
fix user can not get login logs bug
 2015-07-07 17:13:18 +08:00
Jiajun Liu 627d627995 fix user can not get login logs bug 2015-07-07 16:59:24 +08:00
Jiajun Liu 19343540b9 fix line break bug 
some system user '\n\r' as line break, if we split commands by '\n',
then '\r' will be considered as part of commands which will break sudo
authentication. we can use splitlines function to avoid the problem.
 2015-07-07 16:59:24 +08:00
Jiajun Liu 915adb2fd3 fix user can not get permission applies bug 2015-07-07 16:59:21 +08:00
ibuler c25cd3c005 Merge remote-tracking branch 'remotes/github/master' 2015-07-03 21:29:25 +08:00
ibuler 32ab051bbc modify cmd_group num bug 2015-07-03 21:27:20 +08:00
ibuler f7e70e56e3 modify sudo conn timeout bug 2015-07-03 21:09:17 +08:00
蓝枫 acfa0171ca Update log_offline.html 
a small bug
 2015-06-15 16:06:12 +08:00
ibuler ce8e1e0ae3 Merge remote-tracking branch 'remotes/github/master' 2015-06-11 14:05:16 +08:00
ibuler 7cb4ff97ea modify cmd_edit bug 2015-06-11 14:01:49 +08:00
蓝枫 787a2591c4 Update layer.min.js 
update url
 2015-06-09 16:30:59 +08:00
ibuler 95cc2830c8 resolve kill process bug 2015-06-09 09:49:31 +08:00
ibuler 5bae8245bd modify source ip bug 2015-06-09 09:32:35 +08:00
ibuler dcfd4e05ec modify sudo cmd bug 2015-06-04 10:15:41 +08:00
ibuler 1662269153 websocket auth add 2015-05-28 17:00:03 +08:00
ibuler ce99bf2266 placeholder 2015-05-25 18:35:32 +08:00
ibuler 1952d1ca23 modify sudo show 2015-05-25 18:27:57 +08:00
ibuler bf80799fb6 modify port type 2015-05-25 17:13:08 +08:00
ibuler 38f89042ac modify single user login bug 2015-05-25 14:16:08 +08:00
ibuler 67b2467bc9 Merge branch 'guanghongwei' 2015-05-25 10:10:49 +08:00
ibuler 345be469fa Merge branch 'wangyong' 2015-05-25 10:07:25 +08:00
halcyon 04522c0b80 修改port字段 2015-05-25 10:03:55 +08:00
蓝枫 4a9e002440 Merge pull request #6 from losswei/master 
修复当用户使用Ctrl+C结束进程时,没有正确退出
 2015-05-22 17:24:46 +08:00
何威 6998036bdc 修复当用户使用Ctrl+C结束进程时,没有正确退出 2015-05-22 17:18:37 +08:00
ibuler e09cb10439 modify a bug with 10.0.0.1 10.0.0.11 10.0.0.12 match problem 2015-05-18 17:22:26 +08:00
ibuler caa318b808 modify a bug with 10.0.0.1 10.0.0.11 10.0.0.12 match problem 2015-05-18 16:40:36 +08:00
ibuler 58fd4374c7 Merge branch 'wangyong' 2015-05-15 12:01:51 +08:00
ibuler f89d444ddf modify requirements.txt 2015-05-15 11:53:31 +08:00
root 49bee0c3fd 修改主机添加或者修改没添加进ALL组bug 2015-05-14 18:02:20 +08:00