github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
5318 Commits
68 Branches
246 Tags
102 MiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '2a53a20808'
${ noResults }
Commit Graph

2594 Commits (2a53a20808792fdce86b74d79e18358cbc3c2be6)

Author SHA1 Message Date
Bai 01a52812f0 [Update] 修改用户MFA禁用/更新的View
5 years ago
Bai 041d99f0be [Update] 更新remote-app用户/用户组时自动刷新页面
5 years ago
Bai 75edc26a10 [Update] 修改翻译，禁用资产提示不支持ansible的错误提示
5 years ago
Bai 2f7b169405 [Update] 修改授权用户/用户组页面删除用户组失败的问题
5 years ago
ibuler 76ef9b292b [Update] 修改public api
5 years ago
ibuler 1540cbdcaa [Update] 修改csv render
5 years ago
Bai e951b64b0a [Update] 修改版本号1.5.9
5 years ago
ibuler 5d129fd0da Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
ibuler b529127461 [Update] 修改user role
5 years ago
Bai d878089ebd [Update] 用户资产详情Modal添加comment
5 years ago
Bai 4658a4c90f [Update] 修改向导文案
5 years ago
Bai d06ea2944e [Update] 修改Dashboard API
5 years ago
ibuler 154aad1e22 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
ibuler 17163dd909 [Update] 用户Profile添加在当前组织的角色
5 years ago
Bai 9341ce9f84 [Update] 修复AssetUserViewSet 使用Option方法时error
5 years ago
ibuler 195cbbbe42 [Update] 修改profile serialzier
5 years ago
xinwen eb74d13059 [Update] Asset filter 添加 platform__base 字段
5 years ago
xinwen 4dd6d4498b [Update] Asset filter 添加 platform__name 字段
5 years ago
ibuler dd5bf546df [Update] 修改serialzier_class
5 years ago
ibuler d6debde566 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
ibuler efc66cc7ee [Update] 默认关闭debug
5 years ago
Bai 4bd2681bf0 [Update] Merge from dev to lina
5 years ago
Bai 98e3adbb11 [Update] Merge from master to dev
5 years ago
Bai 7b3647e78a [Bugfix] 修复用户页面更新MFA时解除管理员强制启用的Bug
5 years ago
Bai 0a8eeca629 [Update] 仪表盘缓存key添加组织id
5 years ago
Bai 0cff6ab29b [Update] Merge fromo dev to lina
5 years ago
ibuler cda677a30f [update] 修改remote apps的serializer
5 years ago
ibuler 2680396680 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
ibuler 227f97c2f5 [Update] 修改remote apps 字段
5 years ago
老广 ad3231c8a3
Merge pull request #3982 from jumpserver/update-ops-migrate
5 years ago
ibuler e39d8dce3c [Update] 修改fields
5 years ago
ibuler 0bdc425c55 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
ibuler 0a7f63cc5e [Update] 修改remote app api
5 years ago
xinwen c6e0e9a79a [Update] 重建 ops 0018 迁移脚本
5 years ago
BaiJiangJie 4cebfc7f6a
[Update] 修改翻译 (#3981)
5 years ago
xinwen 3ee051303a [Update] audits 模块为一些 models 字段添加 verbose 信息
5 years ago
老广 9fa31be4bf
Merge pull request #3976 from jumpserver/add-audits-apis
5 years ago
Eric 48b71bb11b AUTH_LDAP_USER_ATTR_MAP to Dict field
5 years ago
Bai 11b3c57c92 [Update] 修改dashboard中使用的变量名
5 years ago
xinwen e339ed1fb3 [Add] audits apis
5 years ago
Bai 185c53d311 [Update] Merge from master to dev
5 years ago
BaiJiangJie 2f030c02ec
Merge pull request #3973 from jumpserver/master_org
5 years ago
ibuler c6ed6d8acb [Update] 去掉debug信息
5 years ago
ibuler 331cfe2aed [Bugfix] 修复节点数量缓存显示不对的bug
5 years ago
Bai e48dbabef2 [Update] 修改翻译
5 years ago
Bai 181973f235 [Update] 优化仪表盘页面加载
5 years ago
ibuler 1936a6d5ee [Update] 去掉perms cache enable settings
5 years ago
ibuler 44a2a51f59 Merge branch 'PERM_CACHE_CONFIG' into dev
5 years ago
ibuler 2d4498578a [Update] 修改授权缓存配置的默认值
5 years ago
xinwen ac902501ec [Add] ftp-logs api
5 years ago
xinwen dec89ae5ee [Update] login-logs api 添加 `mfa_display`
5 years ago
Eric 9a39ccd37d [Update] Reponse status code from 401 to 400
5 years ago
ibuler 8c0bf0b71b [Update] Login log 添加display field
5 years ago
Eric 7b339df430 [Update] save settings
5 years ago
Bai aec78dc3c7 [Update] 添加组织详情->组织用户tab页，解决组织详情页面加载超时问题
5 years ago
ibuler 6bb13a26f5 [Update] 修改用户serializer
5 years ago
ibuler b92137afd9 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
老广 962763dc7b
Merge pull request #3954 from xuxinwen/feature-audits-apis
5 years ago
xuxinwen f4eca83a49 [feature] 添加 login-logs API
5 years ago
Eric 79eb838250 [Update] setting fields automatically generated by serializer
5 years ago
Eric 82710294f4 Merge branch 'lina' of https://github.com/jumpserver/jumpserver into settings_api
5 years ago
Eric 2d18acf6f7 [Update] settings api
5 years ago
ibuler f8c323cf5c [Update] 优化user group serializer
5 years ago
ibuler b6f5b335bd Merge branch 'api_perf' into lina
5 years ago
Eric f451f8a979 Merge branch 'lina' of https://github.com/jumpserver/jumpserver into settings_api
5 years ago
ibuler 5c4dfabc48 [Update] 修改settings
5 years ago
Bai 6eaba4e2fb [Update] openid配置分块
5 years ago
ibuler 0c0c0e6d6f Merge branch 'dev' into lina
5 years ago
Eric 20cf7c7c52 [Update] Add settings api
5 years ago
ibuler 230d6137f3 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
ibuler aa9533eb5b [Update] Groups users字段可以显示
5 years ago
Bai 23f9454e5d [Update] 修改Url name (oidc => openi)
5 years ago
Bai 9eee79f7d4 [Update] 调整openid backend顺序；openid 用户创建/更新添加日志输出
5 years ago
Bai c0089a98f4 [Update] 修改openid信号名称
5 years ago
Bai 87242c13a1 [Update] 修改信号监听kwargs
5 years ago
Bai 184432a2a6 [Update] 更新OpenID的配置项以及对应的信号监听
5 years ago
Bai a505995f49 [Update] 修改config_example(openid)
5 years ago
BaiJiangJie 7833ff6671
Dev oidc (#3941)
5 years ago
Bai fc5ec3f21c [Update] 更新仪表盘数据显示问题
5 years ago
ibuler efb5d4135a [Update] 优化api字段显示
5 years ago
ibuler 5f2c9c3801 [Update] 添加 authentication backend header
5 years ago
Bai 586c04cba6 [Update] 添加oidc-op配置信息
5 years ago
BaiJiangJie 272701a8fd
Dev oidc (#3930)
5 years ago
Eric c8c6ba1c19 [Update] add terminal model fileds
5 years ago
老广 2df7bd8510
Merge pull request #3926 from jumpserver/fix_otp_error
5 years ago
ibuler 44db0e8a5d [Bugfix] 修复查询授权时额外查询platform的问题
5 years ago
ibuler 91c994924f [Update] 修改报错文案
5 years ago
ibuler 61407331bc [Bugfix] 修复otp登录时导致的500
5 years ago
BaiJiangJie 1b1a686b96
Merge pull request #3922 from jumpserver/dev
5 years ago
BaiJiangJie 0379e5160c
[Bugfix] 修复真实组织下，新建的用户角色显示不稳定的问题2 (#3919)
5 years ago
BaiJiangJie 386ce629ac
Merge pull request #3918 from jumpserver/fix_connectivity
5 years ago
Bai b4cc2bbff9 [Bugfix] 修复真实组织下，新建的用户角色显示不稳定的问题
5 years ago
BaiJiangJie e74289b223
[Update] 修改用户密码重置页面错误信息提示2 (#3914)
5 years ago
ibuler 98afa032a7 [Update] 修复资产页面可连接性
5 years ago
Bai 081f4b1c0a [Update] 修改用户密码重置页面错误信息提示
5 years ago
BaiJiangJie e9fe5b3004
Merge pull request #3908 from jumpserver/dev
5 years ago
Bai 6890d549ed [Update] 修改忘记密码页面的错误信息提示
5 years ago
ibuler 6a2a0013a8 [Update] 去掉debug
5 years ago
ibuler 864a4c0485 [Bugfix] 修复显示未授权资产的bug
5 years ago
ibuler 3648a1458b [Update] 修改command options get view filter
5 years ago
BaiJiangJie 5001f48982
Merge pull request #3899 from jumpserver/dev
5 years ago
Bai 83eb8f77d1 [Update] 修改测试邮件后，配置获取不稳定的Bug（显示给settings赋值导致）
5 years ago
BaiJiangJie 4eaaa2462b
Merge pull request #3897 from jumpserver/dev
5 years ago
Bai 77149bf36c [Update] 修改监控多个会话时，总是覆盖同一个tab页
5 years ago
Bai 6337d0d0a1 [Update] 修改会话can_join为property
5 years ago
BaiJiangJie 8fd5e6521f
Merge pull request #3892 from jumpserver/dev_bai
5 years ago
Bai 55fa5800b1 [Update] 修复系统设置-终端设置-资产排序设置不生效的Bug
5 years ago
BaiJiangJie 6cdba2e8d2
Merge pull request #3890 from jumpserver/dev_bai
5 years ago
Bai 63519ec076 [Update] 修改命令记录/操作/改密日志搜索字段没清空的问题
5 years ago
Bai 48fa26a3bc [Update] 修改操作日志搜索字段没清空的问题
5 years ago
Bai d969563e43 [Update] 修复自定义平台列表在详情页删除失败的bug
5 years ago
Bai 4fb4a9f622 [Update] 更新翻译
5 years ago
BaiJiangJie 4dcd4749c3
Merge pull request #3884 from jumpserver/dev
5 years ago
BaiJiangJie 508d1c2c1f
Merge pull request #3883 from jumpserver/master_bai
5 years ago
Bai 41cbd3e0f6 [Update] 修改OpenID用户获取username的问题
5 years ago
Bai d5e1ca7908 [Update] 添加翻译
5 years ago
Bai 06fb502a1d [Update] 修改文案: 加入 -> 监控
5 years ago
Bai 3f6d7637c3 [Update] 更新用户添加CAS来源选项
5 years ago
ibuler 0d2b4d7ca3 [Update] 添加ids filter
5 years ago
Bai d1d73da322 [Update] Merge from dev
5 years ago
Bai 396bc9b6ae [Update] 修改用户ViewSet序列类返回的admin_orgs（解决组织管理员登录的Bug)
5 years ago
BaiJiangJie 27ffed1be9
Merge pull request #3868 from jumpserver/dev_user
5 years ago
Bai af9d42695f [Update] 修改用户ViewSet序列类返回的admin_orgs（解决组织管理员登录的Bug)
5 years ago
Michael Bai dc172e1ef0 [Update] 修复AuthBook删除失败的Bug
5 years ago
ibuler cd7946f3f0 [Update] 修改一些bug
5 years ago
BaiJiangJie 4994a4a387
Dev bai (#3865)
5 years ago
Bai 44cd82f3e1 [Update] 修改翻译
5 years ago
Bai adf14b0f2e [Update] 修改版本号
5 years ago
Bai f5a7c4131d [Update] 修改校验join session的url-name
5 years ago
ibuler e7031d0ac1 [Update] 修改serailizer mixin
5 years ago
Bai ef27188f86 [Update] 修改Bug: CommandViewSet的Option方法Error
5 years ago
Michael Bai fb62fbde6c [Update] 命令记录导出: 只导出满足搜索条件的数据
5 years ago
BaiJiangJie 521f4ea86b
Merge pull request #3857 from jumpserver/1.5.8_bai
5 years ago
Bai e9827c8b25 [Update] 添加会话加入校验API
5 years ago
Bai 29b099efc0 [Update] 添加加入会话按钮
5 years ago
Bai e9fc56c056 [Update] 修改日志日期显示问题
5 years ago
Bai e9103ee608 [Update] 对自定义MetaDict字段值进行strip
5 years ago
ibuler f8dae2a3c9 [Update] 时区允许设置
5 years ago
BaiJiangJie 7977294c5c
Merge pull request #3841 from jumpserver/dev
5 years ago
Michael Bai 5268c0faae [Update] OpenID登录成功后，如果用户没有email字段则构造默认的email
5 years ago
Bai 5087c0e06f Merge branch 'dev' into 1.5.8_cap
5 years ago
Bai 4583beaec0 [Update] 创建AuthBook对象的方法从ModelManager中移动到Model中，保留原生的对象create方法；同时添加事务处理；
5 years ago
Bai 4503df910d [Update] 优化创建AuthBook逻辑；添加锁机制(基于redis-lock)；
5 years ago
Michael Bai 55c7e06185 [Update] 修改任务执行日期显示本地时间
5 years ago
ibuler 0fd43f48f0 [Bugfix] 修复因数据不支持timezone引起的仪表盘数据为空的bug
5 years ago
ibuler dffd05cd20 [Update] 修改组织获取优先级
5 years ago
Michael Bai 89f62d8e6b [Update] 更新翻译
5 years ago
Michael Bai 41b73c3701 [Update] 修改提示播放器下载地址
5 years ago
Michael Bai 8328edd69c [Update] 修改Node generate fake时死循环的问题
5 years ago
ibuler 9bf5d6dd45 [Update] 用户profile中添加orgs
5 years ago
ibuler 064cb16d25 [Update] 禁用ansible连接复用
5 years ago
ibuler b25096925b [Bugfix] 修复重置并下载ssh key的bug
5 years ago
ibuler 5ac1467564 [Update] 修复收藏数量不对的问题
5 years ago
ibuler b8d0272e37 [Update] 修改测试系统用户显示
5 years ago
ibuler 0b7a90b83c Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler 7cf000262d [Update] django cas ng 退出逻辑有问题，暂时屏蔽
5 years ago
BaiJiangJie fa7e0d84f9
Merge pull request #3794 from jumpserver/dev_bai
5 years ago
Bai 98f6d0146c [Update] 修改批量移除节点时不选择节点给出提示信息
5 years ago
ibuler d0fac3f838 [Bugfix] 修复task 列表、
5 years ago
ibuler a41988d2b5 [Bugfix] 修改配置文件，支持cas proxy
5 years ago
Bai ae98eee0c7 [Update] 更新版本号
5 years ago
Bai 91c42e8530 [Update] 修改执行task时切换root组织2
5 years ago
Bai 00d9f71384 [Update] 修改执行task时切换root组织
5 years ago
BaiJiangJie ffce909ee3
Merge pull request #3783 from jumpserver/bugfix
5 years ago
BaiJiangJie 0e62ea787c
Merge pull request #3785 from jumpserver/login_image_2
5 years ago
jym503558564 cedb862420 [Fix] 修改登录图片亮度
5 years ago
Bai a6054ff6a5 [Update] 修复批量删除资产，当待删除数量和资产总数相等时，提示删除失败。
5 years ago
Bai a67b445026 [Update] 修复录像存储ceph的help_text
5 years ago
jym503558564 516e75cbf4 [Fix] 修改登录界面LOGO
5 years ago
Bai 15ca775005 [Update] 删除推送系统用户时关于task的log
5 years ago
Bai 41ca43bf33 Merge branch 'bugfix' of https://github.com/jumpserver/jumpserver into bugfix
5 years ago
Bai c6a604fd5f [Update] 修复显示创建者字段值的问题
5 years ago
ibuler 8e84efb296 [Update] 修改一些文案和翻译
5 years ago
ibuler caee286973 [Update] 修改华为云始终有效的bug
5 years ago
ibuler 672b82c3d6 [Bugfix] 修复可能无法找到command execution的bug
5 years ago
ibuler 55554a025f [Bugfix] 修复动态系统用户更新用户时无法推送的bug, 修复通过relation api无法触发m2m_change的bug
5 years ago
ibuler c91ce2b99f [Bugfix] 修复动态系统用户返回auth info的bug
5 years ago
ibuler 02a901467b [Bugfix] 修复动态系统用户登录windows的bug
5 years ago
ibuler 00b3c7c945 [Bugfix] 修复动态系统用户执行批量命令的bug
5 years ago
ibuler 2f9598ba49 [Update] 修复ops task中任务某版本任务的bug
5 years ago
ibuler 3138abb00c [Bugfix] 修复ops列表任务无法删除的bug
5 years ago
Bai 04945809a5 [Update] 修改只有local用户需要发送创建成功邮件、发送密码过期邮件；
5 years ago
Bai eb448dc3f2 [Update] 更新翻译
5 years ago
老广 1fd2e782f8
1.5.7 Merge to dev (#3766)
5 years ago
ibuler 1e8ef8c925 [Update] Merge with master
5 years ago
ibuler c354b55f61 [update] 修复获取settings有问题的bug
5 years ago
ibuler 76ac0215fe [update] 修复获取settings有问题的bug
5 years ago
ibuler bcae30814d [Update] 修改导入
5 years ago
老广 98bb6c63f5
[Update] 修改切换组织后页面跳转 (#3715)
5 years ago
老广 8b8b11ce1e
[Update] 恢复到原来的sql (#3707)
5 years ago
BaiJiangJie 5f61f2b555
Merge pull request #3702 from jumpserver/dev_interface
5 years ago
Bai 62d2e01cdf [Update] 修改终端获取登录标题配置的逻辑
5 years ago
老广 5d313a827b
[Update] 优化session 索引 is_finished (#3697)
5 years ago
ibuler edf6baa52d [Update] 修改api创建的token有效期是600s
5 years ago
老广 3c69860b24
[Update] 优化sql, or方式改为union (#3682)
5 years ago
老广 aa2255a87e
[Update] sql优化，查询用户资产权限时，使用union替代or (#3681)
5 years ago
Bai ae98fb4332 [Bugfix] 处理心跳时guacamole上报的session为str处理为list
5 years ago
Yanzhe Lee 29730757b8 Infer User.name from OpenID UserInfo.name (#3674)
5 years ago
Bai da6a0c286d [Update] 修复用户更新页面会清空用户public_key的问题
5 years ago
Bai 7f9644dbac [Update] 修改获取用户登录的ip和type
5 years ago
Bai dd52baae12 [Update] 翻译应用树更节点（API）
5 years ago
Bai 8e75e519fa [Update] 修改copyright
5 years ago
Bai 6fc7a4cb21 [Update] 更新翻译
5 years ago
Bai 2827a64095 [Update] 更新命令批量执行资产树（将没有ssh协议的资产设置为nocheck）
5 years ago
Bai 7d855e5ad8 [Update] 批量命令执行开放rdp系统用户
5 years ago
Bai 9ef4762817 [Update] 更新翻译
5 years ago
八千流 29457ad867 Assets_permission_action 优化 (#3585)
5 years ago
Bai c07536b26f [Update] 系统用户详情(mysql)开放命令过滤器
5 years ago
Bai 4295aec492 [Update] 系统用户(mysql)开放命令过滤器
5 years ago
Bai 2fc68ca6f1 [Update] 授权的 RemoteApp/DatabaseApp 进行去重
5 years ago
Bai 63746accf9 [Update] 修改js默认语言为中文
5 years ago
Bai 670e2d7352 [Update] 更新翻译
5 years ago
Bai f1b8c1965d [Update] 修改删除管理用户（存在关联资产）的Bug
5 years ago
Bai 0c0eb843ab [Update] 修改资产树移动资产的问题
5 years ago
Bai 14581ac775 [Update] 资产节点添加资产时，祖先节点授权的系统用户关联对应资产
5 years ago
Bai ff1828bdd6 [Update] 修改Swift录像存储创建参数及API返回值
5 years ago
Bai 1c9be184fd [Update] 修改LDAP认证逻辑，密码为空时认证失败
5 years ago
Bai 005272cdc0 [Update] 更新系统用户认证信息private_key转换
5 years ago
Bai 9f42dfb26e [Update] dateRange插件支持i18n 2
5 years ago
Bai f702fc7d93 [Update] dateRange插件支持i18n
5 years ago
Bai 210a2d7fe6 [Update] 更新Session表asset字段长度128
5 years ago
Bai 79b5618756 [Update] 修改作业中心批量命令资产树收藏夹循环现实的问题
5 years ago
BaiJiangJie bf922459ff
[Update] 修改创建按钮样式；Open 数据库应用；取消资产/系统用户/组织等名称对于特殊字符的限制； (#3594)
5 years ago
BaiJiangJie b072e98148 [Update] 修改确认用户认证成功和绑定MFA的前后逻辑（解决绕过绑定MFA的漏洞；解决管理员重置用户MFA后自动退出的问题）
5 years ago
BaiJiangJie 352bfeeb7a [Update] 绑定MFA页面（二维码显示）
5 years ago
BaiJiangJie 8702761303 [Bugfix] 修改BlockLoginError的msg值在初始化中设置（数据表没生成之前启动会有问题）
5 years ago
BaiJiangJie 9556d33d1c [Update] 修改版本号（v1.5.6）
5 years ago
BaiJiangJie 75c6047236 [Update] 添加清除幽灵mysql会话
5 years ago
BaiJiangJie 131496bfee [Update] 添加清除幽灵rdp会话
5 years ago
BaiJiangJie c084412e53
[Update] 解决Vault翻页再次选择资产时不能设置到select框的问题：select.style === single 时 (#3579)
5 years ago
BaiJiangJie 08fb8f5d92 [Update] 修改操作日志title文案：操作者
5 years ago
BaiJiangJie c963937f00 [Update] 命令存储ES字段设置为required
5 years ago
BaiJiangJie b64ae358fb
Merge pull request #3572 from jumpserver/dev_bai
5 years ago
BaiJiangJie 42c5783e43 [Update] 修改右击节点rMenu菜单show offset
5 years ago
BaiJiangJie a2350e7f1d
Merge pull request #3571 from jumpserver/bugfix
5 years ago
ibuler b3114a1f3d [Bugfix] 修复vault导出选择id的bug
5 years ago
BaiJiangJie b4cf540e51
[Update] 操作日志添加新的Record Model；用户登录日志采用同步机制；修改DatabaseAppAPI权限（加入AppUser）； (#3570)
5 years ago
BaiJiangJie 7a6a1b9b59 [Update] 修改校验用户资产权限API不使用缓存
5 years ago
BaiJiangJie f063832bc6 [Update] 支持Windows批量命令2
5 years ago
BaiJiangJie 1d30c1900d [Update] 支持Windows批量命令
5 years ago
BaiJiangJie e978308335 [Update] 修改Adhoc字段become可以为空
5 years ago
BaiJiangJie d6a95d3f1a [Update] 更新翻译（用户详情页）
5 years ago
BaiJiangJie 829e1f4cac
[Update] 修改用户详情页面 (#3555)
5 years ago
BaiJiangJie b365ba7982
[Update] 修改用户列表批量删除判断条件 (#3553)
5 years ago
BaiJiangJie 9cfccf8a1b
[Update] 更新翻译 (#3552)
5 years ago
BaiJiangJie 16f727c60d
[Feature] 添加功能：数据库应用 (#3551)
5 years ago
BaiJiangJie ac2ba63856
[Update] 修改资产授权url (#3550)
5 years ago
老广 55c95c58f6 Add new model to operate log (#3546)
5 years ago
八千流 907703d911 [Update] 修复 工单按用户搜索无效的问题 (#3540)
5 years ago
老广 e1919d0a62
Asset meta (#3539)
5 years ago