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

1366 Commits (9a2287430506dd9f021c9b6cf707fe367c284d24)

Author SHA1 Message Date
ibuler 1c5ce61ed0 [Update] 修改Org刷新cache
6 years ago
ibuler 75e67410cf [Bugfix] 修复批量更新资产和用户的bug
6 years ago
ibuler c9d137bc20 [Update] 修改Mixin，允许org_id不填写
6 years ago
ibuler e59b95e97a Merge remote-tracking branch 'github/dev' into dev
6 years ago
ibuler bb6394150d [Update] 修改批量更新资产的bug
6 years ago
ibuler 2354f0c970 [Bugfix] 修复无法批量禁用启用的bug
6 years ago
ibuler 05ecd7497a [Update] 不可以更改root节点名称
6 years ago
ibuler 6b86b8b485 [Bugfix] 修复资产数量不对的bug
6 years ago
ibuler 7da46354ca [Update] 去掉debug
6 years ago
ibuler e41aad1576 [Bugfix] 修复点击资产报错
6 years ago
ibuler 3f049440b7 [Bugfix] 修复可能引起的创建外键失败
6 years ago
老广 a792781b98
Merge branch 'master' into dev
6 years ago
ibuler 3a4c7846bf [Bugfix] 修改创建第一个节点的Bug
6 years ago
ibuler ccc292d9a9 [Update] 去掉debug信息
6 years ago
pufer 337338ebf3 增加多OU支持 (#1262)
6 years ago
ibuler aa3bc7b53a [Update] 权限修改
6 years ago
老广 d5451a482a
Dev (#1646)
6 years ago
ibuler 534734881c [Update] 修改版本号
6 years ago
ibuler 8236c7baa0 Merge remote-tracking branch 'github/dev' into dev
6 years ago
BaiJiangJie 96ec5fac99 [Update] 更新 xpack/orgs 删除功能：限制在当前org下删除当前org (#1645)
6 years ago
ibuler b7fcf80fc5 [Update] 优化用户资产页面
6 years ago
ibuler de3695bf97 Merge remote-tracking branch 'github/dev' into dev
6 years ago
ibuler 7c814080b2 [Update] 优化一些api
6 years ago
BaiJiangJie f5531b6065 [Update] xpack/orgs组织添加删除功能-js; 修复Label继承Org后bug; (#1644)
6 years ago
ibuler b0aa9f197a [Bugfix] 修复跳转错误的问题
6 years ago
ibuler fc156e23f3 [Bugfix] ...
6 years ago
ibuler 1a05dab572 [Update] 修改user api权限
6 years ago
ibuler b8ecb6f81d [Update] 用户修改
6 years ago
ibuler c01936facc [Bugfix] 修复不登录就能查看资产的bug
6 years ago
ibuler 90c629c837 [Update] 修改url
6 years ago
ibuler c9d192eefc Merge remote-tracking branch 'github/org' into org
6 years ago
ibuler 9c4ebf9c75 [Update] 修改支持xpack
6 years ago
ibuler 37d89b4ea2 Merge branch 'tmp_org' into org
6 years ago
ibuler 87e0e1f2c4 [Update] Asset返回org name
6 years ago
ibuler 183ff09530 [Update] 修改token返回
6 years ago
BaiJiangJie 485a178c0a [Update] 创建/更新用户的role选项；密码强度提示信息中英文； (#1623)
6 years ago
BaiJiangJie 227cc4e965 [Update] 更新org下普通用户的资产详情 (#1619)
6 years ago
ibuler 01bef95e6e Merge remote-tracking branch 'github/org' into org
6 years ago
ibuler 672dd66023 [Bugfix] 修复一些bug
6 years ago
ibuler c032294b14 [Bugfix] 修复一些bug
6 years ago
BaiJiangJie 6ce813faf8 [Bugfix] 修复coco启动失败(load_config_from_server)、硬件刷新，测试连接，str 没有 decode(… (#1613)
6 years ago
ibuler 23815f87c5 [Update] 升级url
6 years ago
ibuler 8afd5ef90a [Merge] 修改一下bug
6 years ago
BaiJiangJie a10e47f72c Merge branch 'org' into michael_org
6 years ago
BaiJiangJie 3dc214d1fa [Bugfix] 修复org下用户查看我的资产不显示已授权节点/资产的bug
6 years ago
BaiJiangJie 8f654c37a9 [Update] Node get_all_assets 过滤游离资产，条件nodes_key=None -> nodes=None
6 years ago
ibuler b29a541aa6 [Update] Add init
6 years ago
ibuler 9fd52f6665 [Bugfix] 修复merge引起的bug
6 years ago
ibuler f4c86718dc [Update] Merge dev
6 years ago
老广 4ff7a1f066
Merge pull request #1600 from jumpserver/bai_org
6 years ago
ibuler eca245fdd5 [Bugfix] 修复节点前面有个空目录
6 years ago
ibuler 7e3cf908a1 [Update] 修改get_all_assets
6 years ago
老广 dded4e10fb
Merge pull request #1599 from jumpserver/dev
6 years ago
BaiJiangJie 45a354f848 [Bugfix] 修复org下普通用户打开web终端看不到已被授权的资产和节点bug
6 years ago
老广 a48fb9de8d
Tmp org (#1596)
6 years ago
BaiJiangJie 04e7f54c69 [Update] org admin显示资产详情右侧选项卡；修复资产授权添加用户，会显示其他org用户的bug (#1594)
6 years ago
BaiJiangJie d649aacfd6 [Update] asset platform 取消*required (#1595)
6 years ago
ibuler 7e65e44a3c [Update] 兼容guacamole手动模式上传system user是uuid
6 years ago
ibuler 74c3f12275 [Update] 添加脚本，将windows协议改为rdp
6 years ago
ibuler 8c12c382a5 [Bugfix] 修复merge带来的问题
6 years ago
ibuler 2ecfecb06f [Update] Merge with dev
6 years ago
BaiJiangJie ac238aa36e [Update] 修改用户登录失败限制次数，3->7 (#1586)
6 years ago
ibuler 2abb9efe96 [Update] Org功能修改
6 years ago
BaiJiangJie f17727deb9 [Update] 在线/历史/命令model添加org；修复命令记录保存org失败bug (#1584)
6 years ago
老广 36f1165d1b
Tmp org (#1583)
6 years ago
BaiJiangJie e7c530d8e6 [Update] 添加授权规则org (#1580)
6 years ago
老广 b156f4ad16
Tmp org (#1579)
6 years ago
老广 16b23a37fe
增加命令导出 (#1566)
6 years ago
ibuler e41add6126 Merge remote-tracking branch 'github/dev' into dev
6 years ago
ibuler f4c31d8e86 [Update] 修改权限判断
6 years ago
ibuler 28e8f204ec Merge remote-tracking branch 'github/dev' into dev
6 years ago
ibuler 80f147cf13 [Update] 修改settings
6 years ago
老广 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