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

465 Commits (7e65e44a3cec8e66eff60ea84f42d88755c73c25)

Author SHA1 Message Date
ibuler 7e65e44a3c [Update] 兼容guacamole手动模式上传system user是uuid 2018-07-26 18:12:25 +08:00
ibuler 74c3f12275 [Update] 添加脚本，将windows协议改为rdp 2018-07-26 14:37:10 +08:00
ibuler f4c31d8e86 [Update] 修改权限判断 2018-07-25 10:22:32 +08:00
ibuler ff3f74abe6 [Update] 修改api 2018-07-17 12:06:47 +08:00
老广 1a49cf4d9c
Merge pull request #1532 from wojiushixiaobai/dev 
[Update]修改url地址
 2018-07-16 22:24:09 -05:00
wojiushixiaobai 696589a3cf 修改url 2018-07-16 12:13:06 +08:00
BaiJiangJie 1182313c1a [Update] 取消系统用户-清除认证信息，取消-网关rdp协议认证信息，添加用户unblock功能 2018-07-13 19:30:48 +08:00
ibuler 01185a2d07 [Update] 添加gateway api 2018-07-10 16:03:05 +08:00
ibuler 8bfd2be21f [Update] 清除系统用户认证信息时提示 2018-07-10 15:50:15 +08:00
老广 b03ac46df9
Merge pull request #1456 from wojiushixiaobai/dev 
[Update]修改提示文字
 2018-07-10 02:35:26 -05:00
ibuler 37bb344166 [Bugfix] 修复网关端口不对的问题 2018-07-05 10:58:52 +08:00
ibuler f8c2a445f7 [Bugfix] 修改gateway port 2018-07-05 10:26:16 +08:00
BaiJiangJie f1f06491d6 [Feature] 添加功能, 支持 telnet server. 2018-06-29 14:59:43 +08:00
wojiushixiaobai 2950613b69 修改提示文字 2018-06-20 15:58:01 +08:00
BaiJiangJie 2e6d238c76 [Bugfix] 修复系统用户选择手动登录，ssh命令行连接获取不到login_mode字段值 2018-06-11 19:09:24 +08:00
BaiJiangJie f5a4370b80 [Update] 系统用户选择手动登录，取消自动推送 2018-06-11 17:56:20 +08:00
BaiJiangJie db2273ef27 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev 2018-06-11 16:28:10 +08:00
BaiJiangJie dd07fa678f [Update] 添加功能，系统用户选择登录模式(自动/手动登录) 2018-06-11 16:27:40 +08:00
ibuler 5579d3f0de [Update] 修复测试网关连接known_host问题 2018-06-08 18:28:15 +08:00
BaiJiangJie 4c4430661b [Merge] Merge branch dev of github.com:jumpserver/jumpserver into github_dev 2018-06-05 17:31:55 +08:00
ibuler 482d1bb27f [Update] 修改permisstion util 2018-06-01 16:22:52 +08:00
ibuler e7c7c3a7a8 Merge branch 'dev' into perm_tree 2018-06-01 15:41:50 +08:00
ibuler a9d1538135 [Update] 修改一些方法 2018-06-01 15:34:08 +08:00
ibuler f8ff223f90 [Update] 更新api和model方法 2018-05-31 19:47:57 +08:00
BaiJiangJie 526943a041 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev 2018-05-29 19:26:19 +08:00
BaiJiangJie e9d0104a69 Merge branch 'dev' of github.com:jumpserver/jumpserver into fix_asset_count_dev 2018-05-29 19:20:03 +08:00
BaiJiangJie 7c694c6885 [Update] 合并Node的parent.setter方法，修改node_fake的parent逻辑 2018-05-29 19:19:35 +08:00
ibuler 757a31a52f [Update] 优化asset api, 获取时增加prefetch 2018-05-29 13:19:58 +08:00
BaiJiangJie 5b53cfb4dd [Update] 修改资产树节点(数量)总显示此节点下的资产总数 2018-05-29 11:50:09 +08:00
ibuler b0710c42b0 Merge remote-tracking branch 'github/dev' into dev 2018-05-29 11:27:56 +08:00
BaiJiangJie 3a2973023c [Update] 修改资产树和资产列表数量显示(游离资产) 2018-05-29 11:17:09 +08:00
ibuler 47397d2308 [Bugfix] 修复网关测试连接需要ssh信任key的问题 2018-05-28 16:44:00 +08:00
ibuler 7b57d24dc9 [Update] 优化代码 2018-05-28 15:00:06 +08:00
ibuler 0b4df78393 [Update] 修改permistion utils优化返回的属性 2018-05-28 13:20:26 +08:00
BaiJiangJie 2fab69ca61 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev 2018-05-28 11:15:48 +08:00
BaiJiangJie f9ab0abc37 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev 2018-05-28 10:58:47 +08:00
ibuler fc2a44621b [Bugfix] 修复右击位置不对的bug 2018-05-25 19:17:57 +08:00
ibuler a96bda8ca9 [Update] 修改树形结构 2018-05-25 17:26:57 +08:00
BaiJiangJie de2416b173 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev 2018-05-24 12:42:06 +08:00
ibuler f8384973a1 [Update] 调整Luna的树形结构 2018-05-23 15:15:27 +08:00
ibuler 4b7af1457d [Update] 系统用户新增清除认证的操作 2018-05-17 11:39:04 +08:00
BaiJiangJie c1db33713f [Bugfix] 修复资产授权树root节点bug 2018-05-16 16:12:27 +08:00
老广 e66cfc2e13
Merge pull request #1333 from jumpserver/update_rdp 
[Update] 去掉windows相关无用配置，修复资产树节点移动等问题
 2018-05-16 12:42:01 +08:00
BaiJiangJie ac67c231fc [Update] 修改前端rdp相关配置的选择逻辑 2018-05-16 12:31:13 +08:00
BaiJiangJie 599431f402 [Update] 去掉添加windows相关配置时的一些无用功能，网域网关/会话列表 2018-05-15 17:32:20 +08:00
ibuler ed18cb317f [Bugfix] 修复创建node api的bug 2018-05-15 15:05:49 +08:00
ibuler cb4afabc91 [Bugfix] 修复创建node节点的问题，修复windows session的问题 2018-05-15 14:44:02 +08:00
BaiJiangJie 718715cc6d [Update] 创建系统用户选择rdp协议，去掉相关配置的一些无用功能 2018-05-15 12:52:53 +08:00
BaiJiangjie 38f8c5bb72 [Bugfix] 修复资产树节点移动，资产授权树节点下的资产显示问题 2018-05-14 14:21:32 +08:00
ibuler ebc1b4975a [Update] 自动生成秘钥去掉密码 2018-05-11 18:38:26 +08:00