github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
3460 Commits
69 Branches
244 Tags
132 MiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'f87e08efff'
${ noResults }
Commit Graph

1294 Commits (f87e08efffb9095971692c60e898ac2489d47c55)

Author SHA1 Message Date
老广 c816875f28
[Update] 修改permission (#1574)
6 years ago
老广 2208d6d51e
[Bugfix] 解决Node.root() 死循环，移动AdminRequired到permission中 (#1571)
6 years ago
ibuler e3aa18ff2d [Update] 修改get_current_org 为 proxy对象 current_org
6 years ago
ibuler b5f6f80ae6 [Update] 修改Node
6 years ago
ibuler bbe4080008 [Update] 删掉Premiddleware
6 years ago
ibuler b6523da603 [Update] 修改外键为org_id
6 years ago
ibuler c24f1a0517 [Update] 修改约束
6 years ago
BaiJiangJie 83f220d7de [Feature] 添加命令记录下载功能 (#1559)
6 years ago
wojiushixiaobai e1fff18ce3 替换淘宝IP查询接口
6 years ago
老广 3d34b06203
Merge pull request #1551 from jumpserver/dev
6 years ago
ibuler c94d018d7e [Bugfix] 修复转义引起的中文乱码问题
6 years ago
ibuler ce1fc0f3e2 [Bugfix] 修复授权列表引起的分页bug
6 years ago
ibuler c215278978 [Bugfix] 修复授权列表引起的分页bug
6 years ago
老广 97b240cfdd
Revert "授权页面分页问题"
6 years ago
ibuler fd5f562cbf [Update] stash it
6 years ago
老广 2cb5876d1a
Merge branch 'master' into dev
6 years ago
ibuler 8883e0090f [Update] 更改版本号
6 years ago
ibuler 790652ff4d [Update] 修改协议小问题
6 years ago
ibuler ff3f74abe6 [Update] 修改api
6 years ago
老广 1a49cf4d9c
Merge pull request #1532 from wojiushixiaobai/dev
6 years ago
ibuler 4d1da56872 [Update] 修改asset api
6 years ago
BaiJiangJie 09e636495e [Update] 模版删除unblock的id属性
6 years ago
BaiJiangJie 812078331e [Update] 添加解除用户登录限制功能
6 years ago
wojiushixiaobai 696589a3cf 修改url
6 years ago
ibuler 3e17e94245 [Update] 修改资产
6 years ago
ibuler 5648dcd7e7 [Update] 修改用户view
6 years ago
ibuler 28e47f33c1 [Update] 修改一些逻辑
6 years ago
BaiJiangJie 1182313c1a [Update] 取消系统用户-清除认证信息，取消-网关rdp协议认证信息，添加用户unblock功能
6 years ago
ibuler 7412bdcba7 [Update] 完成基本框架
6 years ago
ibuler d6ec92d82d [Update] 修改url
6 years ago
ibuler ad3214641d [Update] 添加org
6 years ago
wstart fd3df81a64
Update api.py
6 years ago
ycfuck 72517a2c72 授权页面分页
6 years ago
ibuler 01185a2d07 [Update] 添加gateway api
6 years ago
ibuler 8bfd2be21f [Update] 清除系统用户认证信息时提示
6 years ago
老广 b03ac46df9
Merge pull request #1456 from wojiushixiaobai/dev
6 years ago
老广 df95c93bb1
Merge pull request #1503 from jumpserver/update_loginlog
6 years ago
ycfuck eaefb5c669 Revert "资产授权页面增加分页"
6 years ago
林峰任1049851 0ddb9476ba 资产授权页面增加分页
6 years ago
ibuler 75a9deebdd Merge remote-tracking branch 'github/dev' into dev
6 years ago
ibuler b6cd4a20c5 [Bugfix] Data table xss attack
6 years ago
BaiJiangJie 435acafccd [Update] 在线会话，历史会话显示登录来源 Web/SSH Terminal
6 years ago
BaiJiangJie 86e4bc5e9a Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
6 years ago
ibuler 315609bc45 Merge remote-tracking branch 'github/dev' into dev
6 years ago
ibuler 814e6a7df8 [Update] 修改sshpass 引号引入密码，特殊字符处理
6 years ago
BaiJiangJie 5d800fa629 [Update] 修改coco端登录限制次数逻辑
6 years ago
BaiJiangJie bd14266abd [Update] 修改登录日志模型类的MFA字段默认状态为-
6 years ago
BaiJiangJie 88f36c6f02 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
6 years ago
BaiJiangJie 512fc8f8f0 [Update] 优化登录失败次数限制的逻辑，并添加系统安全设置选项
6 years ago
ibuler 37bb344166 [Bugfix] 修复网关端口不对的问题
6 years ago
ibuler f8c2a445f7 [Bugfix] 修改gateway port
6 years ago
BaiJiangJie ff9b1a887f [Update] 添加用户登录失败次数限制
6 years ago
BaiJiangJie 43370c547a [Update] 登录日志逻辑修改变量名
6 years ago
BaiJiangJie 2eda58eadd Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
6 years ago
BaiJiangJie e1be867913 [Update] 更新用户登录日志，记录登录失败日志并添加MFA启用状态信息
6 years ago
ibuler 01afcf701c Merge remote-tracking branch 'origin/dev' into dev
6 years ago
ibuler 4002289974 [Bugfix] 修复详情中删除时的bug
6 years ago
ibuler ef9e03c7ed Merge remote-tracking branch 'github/dev' into dev
6 years ago
BaiJiangJie 3993797527 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
7 years ago
BaiJiangJie f1f06491d6 [Feature] 添加功能, 支持 telnet server.
7 years ago
ibuler eb95a0a912 [Bugfix] 修改下载录像没有目录的bug
7 years ago
ibuler 0a2ff83ca1 Merge remote-tracking branch 'origin/dev' into dev
7 years ago
ibuler 7276bd0b2a [Update] 更新获取session log的方法，以后统一到media/replay中
7 years ago
wojiushixiaobai 2950613b69 修改提示文字
7 years ago
老广 86404db6c7
Merge pull request #1414 from leostudio/dev
7 years ago
BaiJiangJie 2e6d238c76 [Bugfix] 修复系统用户选择手动登录，ssh命令行连接获取不到login_mode字段值
7 years ago
BaiJiangJie f5a4370b80 [Update] 系统用户选择手动登录，取消自动推送
7 years ago
BaiJiangJie db2273ef27 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
7 years ago
BaiJiangJie dd07fa678f [Update] 添加功能，系统用户选择登录模式(自动/手动登录)
7 years ago
老广 e7a731fae9
Merge pull request #1417 from jumpserver/dev
7 years ago
ibuler 73f9f54620 [Update] 修改版本号
7 years ago
梁志艳 a2f23e9681 新增Redis DB配置
7 years ago
ibuler dbc471c195 [Bugfix] 修复小错误
7 years ago
ibuler 4c8eb4a94b Merge remote-tracking branch 'github/dev' into dev
7 years ago
老广 8a5e1b8223
Merge pull request #1407 from jokimina/dev_for_pr
7 years ago
ibuler 5579d3f0de [Update] 修复测试网关连接known_host问题
7 years ago
BaiJiangJie 221fae5875 [Bugfix] 修复用户失效日期截止后还可登录问题
7 years ago
xiaodong f4084c800a [Bugfix] 更新用户信息时不填密码也会触发密码规则验证,导致无法更新
7 years ago
BaiJiangJie c6a8967376 [Update] 删除多余代码
7 years ago
BaiJiangJie 5f2c31e42c [Update] 重置公钥，添加成功信息(user-pubkey-update)/自动跳转下一步(first-login)
7 years ago
BaiJiangJie 64db02c3f8 [Update] 添加用户来源 db/ldap
7 years ago
BaiJiangJie 842841128f Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
7 years ago
BaiJiangJie b026e86741 [Update] 修改判断MFA是否全局启用的逻辑，放到User.otp_force_enabled中
7 years ago
老广 2a30204c4e
Merge pull request #1401 from jumpserver/dev
7 years ago
ibuler 30afcecf59 Merge remote-tracking branch 'github/dev' into dev
7 years ago
ibuler 80d11bbaab [Update] 删除user group继承的抽象类
7 years ago
ibuler 58e36b5f63 [Bugfix] 暂时还不能删除Tree这个类
7 years ago
ibuler 2c413e8d51 [Bugfix] 修复权限查看引起的bug
7 years ago
xiaodong 6b2a38c78d remove useless image
7 years ago
BaiJiangJie fcd17460d7 [Update] 增加密码校验规则中密码最小长度限制6位
7 years ago
BaiJiangJie 4c4430661b [Merge] Merge branch dev of github.com:jumpserver/jumpserver into github_dev
7 years ago
BaiJiangJie ee35ca3643 [Feature] 增加功能，安全设置（全局MFA设置，密码强度校验）
7 years ago
老广 99c4875dd7
Merge pull request #1395 from jumpserver/dev
7 years ago
ibuler 482d1bb27f [Update] 修改permisstion util
7 years ago
ibuler e7c7c3a7a8 Merge branch 'dev' into perm_tree
7 years ago
ibuler 54efc88799 Merge remote-tracking branch 'github/dev' into dev
7 years ago
ibuler a9d1538135 [Update] 修改一些方法
7 years ago
ibuler f8ff223f90 [Update] 更新api和model方法
7 years ago
BaiJiangJie 526943a041 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
7 years ago
BaiJiangJie e9d0104a69 Merge branch 'dev' of github.com:jumpserver/jumpserver into fix_asset_count_dev
7 years ago
BaiJiangJie 7c694c6885 [Update] 合并Node的parent.setter方法，修改node_fake的parent逻辑
7 years ago
ibuler 69e5ab438a [Bugfix] 解决发送邮件重启的问题
7 years ago
ibuler 757a31a52f [Update] 优化asset api, 获取时增加prefetch
7 years ago
BaiJiangJie 5b53cfb4dd [Update] 修改资产树节点(数量)总显示此节点下的资产总数
7 years ago
ibuler b0710c42b0 Merge remote-tracking branch 'github/dev' into dev
7 years ago
BaiJiangJie 3a2973023c [Update] 修改资产树和资产列表数量显示(游离资产)
7 years ago
oldseven 4f28f85410 #1368
7 years ago
ibuler 47397d2308 [Bugfix] 修复网关测试连接需要ssh信任key的问题
7 years ago
ibuler 7b57d24dc9 [Update] 优化代码
7 years ago
ibuler ffabef0040 Merge branch 'large' into dev
7 years ago
ibuler 0b4df78393 [Update] 修改permistion utils优化返回的属性
7 years ago
BaiJiangJie 2fab69ca61 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
7 years ago
BaiJiangJie f9ab0abc37 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
7 years ago
ibuler 0bc86543b5 [Update] 修改用户组详情显示授权资产的bug
7 years ago
ibuler fc2a44621b [Bugfix] 修复右击位置不对的bug
7 years ago
ibuler 9b4b9e6900 [Update] 发送邮件增加用户名显示
7 years ago
ibuler 22a84d57ca [Update] 修改树形结构
7 years ago
ibuler 3f4b5ad465 [Update] Merge
7 years ago
ibuler a96bda8ca9 [Update] 修改树形结构
7 years ago
ibuler b9d0d89f66 [Update] 更改版本好
7 years ago
ibuler 5a7192e035 [Update] 修改心跳bug
7 years ago
BaiJiangJie de2416b173 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
7 years ago
BaiJiangJie 486793ddcd [Bugfix] 修复取消LDAP认证不成功bug
7 years ago
ibuler c529061ee0 [Bugfix] 修复授权uitls的错误
7 years ago
ibuler fe52c57a11 [Bugfix] 修复授权uitls的错误
7 years ago
ibuler f8384973a1 [Update] 调整Luna的树形结构
7 years ago
ibuler d615eb80b5 [Update] 优化使用storage sdk
7 years ago
ibuler 4b7af1457d [Update] 系统用户新增清除认证的操作
7 years ago
BaiJiangJie c1db33713f [Bugfix] 修复资产授权树root节点bug
7 years ago
老广 e66cfc2e13
Merge pull request #1333 from jumpserver/update_rdp
7 years ago
BaiJiangJie ac67c231fc [Update] 修改前端rdp相关配置的选择逻辑
7 years ago
BaiJiangJie 599431f402 [Update] 去掉添加windows相关配置时的一些无用功能，网域网关/会话列表
7 years ago
ibuler ed18cb317f [Bugfix] 修复创建node api的bug
7 years ago
ibuler cb4afabc91 [Bugfix] 修复创建node节点的问题，修复windows session的问题
7 years ago
BaiJiangJie 718715cc6d [Update] 创建系统用户选择rdp协议，去掉相关配置的一些无用功能
7 years ago
BaiJiangjie 38f8c5bb72 [Bugfix] 修复资产树节点移动，资产授权树节点下的资产显示问题
7 years ago
ibuler ebc1b4975a [Update] 自动生成秘钥去掉密码
7 years ago
ibuler 2da87151ed Merge remote-tracking branch 'github/dev' into dev
7 years ago
BaiJiangjie cbc4a0a97b [Bugfix] 资产树节点Node Value值校验修改异常抛出为400
7 years ago
ibuler 0031d025aa [Bugfix] 修复上次提交引起的bug
7 years ago
BaiJiangjie 2583c0b26c [Bugfix] 资产树节点，取消model value unique，并添加唯一性校验，修改新增节点计数器规则
7 years ago
ibuler ebef4f254a Merge remote-tracking branch 'github/dev' into dev
7 years ago
ibuler 116a04da68 Merge branch 'term_js' into dev
7 years ago
ibuler 7de6af89ad [Update] 使用xterm.js替换原来的term.js
7 years ago
ibuler 8e74a04282 [Update] 修改一些bug
7 years ago
BaiJiangjie 3af01d6a31 [Update] 添加功能：资产树显示全部/只显示当前节点下的资产；修复资产树节点主机数与列表显示不一致
7 years ago
老广 2a8358b1aa
Bugfix ldap option (#1300)
7 years ago
ibuler 0a9af98729 [Bugfix] 修复ldap参数改错引起的bug
7 years ago
老广 e9b86ca668
[Update] 修改replay api (#1298)
7 years ago
ibuler d2b0aba620 [Update] 修改replay api
7 years ago
ibuler 7f670ab709 Merge remote-tracking branch 'github/dev' into dev
7 years ago
ibuler 941e55bdec [Update] 添加ldap auth timeout时间
7 years ago
老广 01d136cf1e
Perms return (#1293)
7 years ago
ibuler 4ed9e11090 [Update] 修改用户名校验规则
7 years ago
ibuler cde2e7adb0 [Update] 修改授权列表创建api，返回id
7 years ago
ibuler e291ca9057 [Update] 默认关闭定时任务
7 years ago
老广 1edfb1cec4
[Update] 修改版本号 (#1282)
7 years ago
ibuler 0b89ff17fd [Update] 修改版本号
7 years ago
老广 c0bbda9769
[Update] 暂时隐藏rdp的session，等待windows录像播放 (#1276)
7 years ago
老广 55096f9ad5
Bugfix perm asset not active (#1273)
7 years ago
老广 494cd760d7
Trans change (#1272)
7 years ago
老广 6f494ef09c
校验用户名长度和特殊字符 (#1271)
7 years ago
老广 b074bd8fbd
Merge pull request #1267 from jumpserver/bugfix_user
7 years ago
ibuler 5103dab72e [Bugfix] 解决上次引入的bug
7 years ago
ibuler 16aa42a861 [Bugfix] 修复授权树列表和资产树列表不同的bug
7 years ago
BaiJiangjie 0962a16b22 [Bugfix] 修复首次登录条款问题及引导页面MFA配置问题
7 years ago
ibuler d5debc375e [Bugfix] 修复命令搜索异常bug
7 years ago
ibuler 40a0c4597b Merge remote-tracking branch 'github/dev' into dev
7 years ago
BaiJiangjie ea2863a51b [Update] 创建用户、资产成功的提示信息可关闭
7 years ago
BaiJiangjie 102e1ca97c [Bugfix] 创建资产，资产系统置上，RDP:3389
7 years ago
BaiJiangjie 2823d02763 [Bugfix] 修复资产列表导入，资产id问题
7 years ago
BaiJiangjie c37414045b [Bugfix] 修改用户列表导出，默认导出全部用户
7 years ago
BaiJiangjie 784bec42ff [Update] 修改用户登录,首次登录不需要验证码,登录失败时需要验证码校验
7 years ago
ibuler 9a3d0732bc [Update] 更新授权代码
7 years ago
ibuler 20a7247b16 Merge remote-tracking branch 'github/dev' into dev
7 years ago
ibuler df60981eb4 Merge branch 'dev' of bitbucket.org:jumpserver/core into dev
7 years ago
老广 7aa2bb06e8
Merge pull request #1228 from wojiushixiaobai/dev
7 years ago
liuzheng712 536be1175a
feat: replay api update
7 years ago
BaiJiangjie b5fc76d6a5 [Update] 修改用户首次登录页
7 years ago
ibuler 941dd627e3 [Update] 更新session列表
7 years ago
ibuler 8389c85054 [Update] 更改sesion表结构
7 years ago
ibuler 02ca8c3139 [Update] 更新session api
7 years ago
wojiushixiaobai 5c7acae018 更改版本号
7 years ago
BaiJiangjie 5b52b907c0 [Update] 创建用户，更新用户，添加MFA设置选项
7 years ago
BaiJiangjie 8447c6f487 [Update] 修改coco文案OTP改为MFA
7 years ago
BaiJiangjie ad6e22cd42 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
7 years ago
BaiJiangjie 7a219e1710 [Update] OTP文案修改为MFA
7 years ago
ibuler 0c24310510 [Bugfix] 修复用户错误storage的bug
7 years ago
ibuler 9ac7f26c74 [Update] 修改用户详情，自己更改自己otp，提示小写
7 years ago
BaiJiangjie f73fe1f315 [Bugfix] 修复用户登录缓存设置问题
7 years ago
ibuler 763cf0d981 [Bugfix] 修复解密None的bug
7 years ago
ibuler 95a8bf0988 Merge remote-tracking branch 'github/dev' into dev
7 years ago
ibuler 947f7d206a [Bugfix] 修复生成system user的问题
7 years ago
BaiJiangjie 12c8cf6b76 [Update] 添加OTP认证功能
7 years ago
BaiJiangjie 33bc73aba7 [Update] 添加OTP认证功能
7 years ago
ibuler 035dd16b36 [Bugfix] 修复授权详情中选择用户或资产的bug
7 years ago
BaiJiangjie f450accbf8 [Merge] with dev
7 years ago
BaiJiangjie 0bbfc7433d [Feature] 支持otp
7 years ago
ibuler 48e8785725 [Update] 修改users otp secret key
7 years ago
ibuler b90d3306c5 [Bugfix] 去掉gateway name连接
7 years ago