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

2733 Commits (1d550cbe64aeafbee0a95bd860bdb1251b3297c3)

Author SHA1 Message Date
Bai c0f3a1f64a fix(all): 修复创建资源时，created_by字段长度限制导致创建失败的问题
4 years ago
Bai 0f70f5eccf fix(orgs): 删除组织失败时返回对应错误信息
4 years ago
Bai eef942c155 fix(gather_asset_users): 修复收集资产用户日志中用户名显示不完整的问题
4 years ago
xinwen 061592fa6b fix(terminal): 移除`CommandQueryMixin.get_filter_fields`
4 years ago
Bai ddcd4ebbfc fix(asset_user): 修改创建AuthBook对象锁机制，使用select_for_update替换redis_lock3
4 years ago
Bai 9550ea62fb fix(asset_user): 修改创建AuthBook对象锁机制，使用select_for_update替换redis_lock2
4 years ago
Bai abcb589658 fix(asset_user): 修改创建AuthBook对象锁机制，使用select_for_update替换redis_lock
4 years ago
Bai 1bb366ad94 fix(authbook): 修改创建AuthBook对象锁机制，解决并发操作堵塞问题
4 years ago
xinwen a5df7738f6 fix(audits): 日志审计模块 `Serializer` 添加 `org_id` 字段
4 years ago
xinwen da858c8998
fix(tickets): 隐藏申请资产工单URL (#4307)
4 years ago
BaiJiangJie 724a8f6324
fix(assets): 修复用户name字段长度与资产created_by字段长度不一致导致创建资产失败的问题 (#4302)
4 years ago
ibuler 437df9a533 fix(assets): node asset 关系发生变化是，关联系统用户引起的问题
4 years ago
Bai 7c12f8f462 merge: Merge to dev from branch master
4 years ago
xinwen 6f5a92c21f [Update] assets/gathered_user 添加过滤字段
4 years ago
xinwen 17a76994dc [Update] 系统用户添加过滤字段
4 years ago
jym503558564 39d793bc47 fix:修改 ftp 日志按开始日期排序
4 years ago
xinwen c3eafbee8c [Fix] X-Pack/云管中心 i18n
4 years ago
xinwen 8eb6cfa9c9
fix(ticket): 修改工单获取系统用户的字段 (#4274)
4 years ago
xinwen f430c9e435
Merge pull request #4270 from jumpserver/request-asset-ticket-dev
4 years ago
Bai a30c603bdc fix(user_group): 用户组中添加用户，取消审计员的限制
4 years ago
xinwen 39a75074af [Feature] 添加申请资产工单
4 years ago
Bai 8c7240193a fix(system_user): 修复系统用户测试可连接性失败问题（所有资产）（不应该执行校验系统用户是否可以推送的逻辑）
4 years ago
Bai b622aca9af fix(admin_user): 修复管理用户单独测试某台资产可连接性失败的情况（private_key_file)
4 years ago
Bai 69f49f7776 feat(i18n): 修改翻译
4 years ago
Bai fcd684e2db feat(assets): 资产序列类修改字段名 _name 为 _display
4 years ago
Bai 1c264399bb feat(domain + migrate): 修改网域唯一字段为：org_id + name
4 years ago
Bai 872e2546e9 feat(node): NodeModel添加方法get_or_create_child()
4 years ago
BaiJiangJie 8f347eee4d
Merge pull request #4216 from jumpserver/dev_org
4 years ago
Bai caf312c5be feat(Cloud): 组织管理ViewSet添加搜索字段
4 years ago
Bai ac6168a06c feat(Command execute): 批量命令执行配置添加默认值True
4 years ago
Bai b46e772d09 feat(login password ecrypt): 登录密码加密传输 4
4 years ago
Bai 183df82a75 feat(login password ecrypt): 登录密码加密传输 3
4 years ago
Bai 98c91d0f18 feat(login password ecrypt): 登录密码加密传输（添加翻译）
4 years ago
Bai e17d875206 feat(login password ecrypt): 登录密码加密传输2
4 years ago
Bai 4b1e84ed8a Merge branch 'dev' into dev_login_password_encrypt
4 years ago
Bai 71ee33e3be feat(login password ecrypt): 登录密码加密传输
4 years ago
xinwen 2b6e818943 [Update] 限制上传CSV文件的大小
4 years ago
BaiJiangJie 89496baae5
Merge pull request #4148 from jumpserver/v2.0
4 years ago
Bai cf6aba1f38 [Update] 修改csv导出，最大限制条目数从100->10000条
4 years ago
xinwen 6e3369c944 [Update] sftp log页面操作翻译
4 years ago
Bai c0a153d13a [Update] UserProfileAPI 判断是否设置session过期时间，解决前端关闭浏览器session未失效的问题
4 years ago
xinwen 32ed43ba7b
Merge branch 'v2.0' into fix-mfa-1.5
5 years ago
xinwen 3e993fd044 [Update] 调整`MFA`绑定策略 V2
5 years ago
xinwen 005573b53b [Fix] 重新绑定 MFA 的漏洞
5 years ago
BaiJiangJie c4bd093fd7
Merge pull request #4126 from jumpserver/v2.0
5 years ago
Michael Bai f1e5c7c2bb 添加改密计划安全模式配置项
5 years ago
Michael Bai fcb0aefe3c 更改改密计划安全模式配置项名
5 years ago
Bai 29666cc8d3 [Update] 添加改密计划安全模式配置项
5 years ago
xinwen 1d640eccf6
[Fix] `/opt/jumpserver/apps/jumpserver/views/index.py redirect(assets:user-asset-list)` (#4121)
5 years ago
Bai 64064cb526 [Update] 注释节点树print
5 years ago
Eric_Lee 46941037dd
add SECURITY_COMMAND_EXECUTION (#4114)
5 years ago
xinwen 8ad71b6dd9
[Update] Move LOCAL_DYNAMIC_SETTINGS (#4113)
5 years ago
ibuler 220ccda04d fix: 修改domain创建的assets不是必填的
5 years ago
Eric_Lee 6d30fe797c
fix ldap test bug (#4110)
5 years ago
xinwen 3318df1771
[Fix] 日志审计/FTP日志 (#4109)
5 years ago
Eric_Lee 0ccd806eca
add system user perm api (#4108)
5 years ago
xinwen 7ebe1c2916
[Update] 优化 dynamic settings (#4107)
5 years ago
ibuler 08904c2a9f Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler 19e34270d1 feat: gather user添加搜索字段
5 years ago
Bai afa515d570 Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev
5 years ago
Bai bcba408517 [Update] 修改用户source默认local
5 years ago
ibuler 80d94074e7 feat: 修改资产的标签搜索
5 years ago
ibuler 9347405f08 feat: terminal增加搜索
5 years ago
ibuler da4ad11a69 fix: 修改session command 翻译
5 years ago
ibuler b81e424e80 fix: 修改翻译
5 years ago
ibuler 1f15937139 feat: 修改翻译，添加settings
5 years ago
Bai f4fa011714 [Update] 修改mfa校验code无效翻译
5 years ago
xinwen c5a9a85818
[Update] 完善 作业中心/任务列表 (#4105)
5 years ago
ibuler e23bfa0f69 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler 451690fe8b fix: 修改重定向
5 years ago
Eric_Lee 5bea782b9f
add assignee field for ticket (#4104)
5 years ago
Bai f26f7ca1e7 [Update] 修改parsers，处理dict字段值；解决remote-app csv导入时异常
5 years ago
Bai 927ca162d0 [Update] 修改MFA应用下载图片
5 years ago
Bai 583d295fd1 Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev
5 years ago
Bai b51af1f7d7 [Update] 修改MFA应用下载图片
5 years ago
xinwen edcf9921fe
[Update] apps/assets/serializers/system_user.py (#4102)
5 years ago
Eric_Lee eef172d0e2
Merge pull request #4098 from jumpserver/fix-ops-adhoc
5 years ago
Eric_Lee 5b407fe8bc
Merge pull request #4095 from jumpserver/update-user
5 years ago
Bai 1bb9048910 [Update] 标签序列类assets字段required为False
5 years ago
xinwen 787cdbcadf [Fix] ops.models.adhoc (#4096)
5 years ago
xinwen b14ca14120
[Fix] ops.models.adhoc (#4096)
5 years ago
ibuler 4b2fd0d0da fix: 修复系统用户过滤权限规则的bug
5 years ago
xinwen 3393f18399 [Update] 修改 用户相关 Serializer
5 years ago
ibuler 7e1a379e47 feat: 修改org返回的数据结构
5 years ago
ibuler 213fdd461b fix: 修改翻译
5 years ago
ibuler 148c7ffb43 fix: 添加注释
5 years ago
ibuler 75be45ce43 feat: 使用新的对称加密方式: aes
5 years ago
ibuler 04eb670ada Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler 66f3706142 feat: 添加aes fix: 修改时区的bug
5 years ago
xinwen 9ea98bf2b2
[Feature] 添加 会话管理/历史会话/下载 api (#4093)
5 years ago
ibuler 4695f80172 faet: 修改翻译
5 years ago
ibuler 0452d53c3f Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler ec30ef1f8b feat: readme添加版本说明
5 years ago
Eric_Lee 1c0ad08d80
fix ldap test i18n msg (#4092)
5 years ago
ibuler e1ab453780 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler 1a6597b572 feat: 修改command filter数据结构
5 years ago
xinwen 865522953a
[Feature] 作业中心/任务列表/任务详情 最后运行成功或失败的主机 (#4090)
5 years ago
ibuler 4d4a107101 feat: 修改oid获取顺序，添加从cookie中获取
5 years ago
ibuler 82f70cb0dc feat: ticket添加翻译
5 years ago
ibuler 820186c6d0 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler 4468e2d379 feat: 限制gateway 仅有ssh协议
5 years ago
Eric_Lee bd802e6a50
add logo urls (#4088)
5 years ago
ibuler 9362c272cb Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler ee4534ac4b feat: public setting添加key
5 years ago
xinwen 7ef09a4ca1
[Update] UserSerializer 添加 login_confirm_settings (#4086)
5 years ago
ibuler 31daaed4cd feat: 添加auth confirm 到public setting
5 years ago
ibuler 71202e83f5 feat: 修改用户的api
5 years ago
ibuler b1640e5592 fix: 修改common resource api的权限，否则auditor无法使用
5 years ago
ibuler 076b7babcb 修改批量命令的api
5 years ago
ibuler 8569910658 feat: command exexution audit log的搜索
5 years ago
xinwen 34c556d375
[Fix] spm (#4082)
5 years ago
ibuler a43d6ad34d feat: 资产添加admin_user_display
5 years ago
ibuler ca6825008b Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler 9c6f118dbd feat: 添加批量命令的relation
5 years ago
Bai 5730e60089 [Update] 修改用户profile序列类
5 years ago
Bai afc7f3bb9c [Update] 修改用户public_key生成密钥的view
5 years ago
Bai c411b0a38e Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev
5 years ago
Bai 403b6fc563 [Update] 修改用户更新Public_key的条件判断
5 years ago
xinwen 55ae8bb5e6
[Fix] 系统设置/邮件设置/测试链接失败 (#4081)
5 years ago
Eric_Lee dbcf785e42
add flower view (#4078)
5 years ago
ibuler e6cd126045 feat: 修改api的权限
5 years ago
Bai 420f3c0c4c [Update] 添加celery task log view
5 years ago
Bai 9b2c5cb305 [Update] 修改用户profile序列类3
5 years ago
Bai 907f0068db [Update] 修改用户profile序列类2
5 years ago
Bai a16b3260ba Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev
5 years ago
Bai 1845821f6c [Update] 修改用户profile序列类
5 years ago
ibuler 27d906a877 feat: 去掉js i18n catalog
5 years ago
xinwen 431ba36a26
[Fix] 会话管理/命令记录 时间过滤 bug (#4070)
5 years ago
Eric_Lee 229c782157
change PAGE_SIZE_CHOICE to string value (#4069)
5 years ago
ibuler 5bacab7475 fix: 重置密钥到auth中
5 years ago
ibuler 999286a089 fix: 修复用户公钥错误引起的profile bug
5 years ago
ibuler 68ccaf0cb3 feat: 去掉第一次登录的那个导航
5 years ago
ibuler 8d58d58519 feat: 修改profile view
5 years ago
ibuler 8efc0331de feat: 删掉所有view, templates, forms
5 years ago
ibuler 7c479c2479 feat: 修改docs的url
5 years ago
ibuler 96551856a2 [Update] 部分view放到auth中
5 years ago
ibuler b1f5cc7728 [Update] 禁用view
5 years ago
ibuler 1a84661ca9 feat: 修改filterset_fields => filter_fields，option方法不支持filterset
5 years ago
ibuler 50bea55732 merge: with dev
5 years ago
ibuler a4ece2b271 feat: audits中添加id字段
5 years ago
xinwen b460e4abaa
[Fix] 日志审计 日期过滤与排序bug (#4063)
5 years ago
BaiJiangJie 087ba9ae95
Merge pull request #4059 from jumpserver/lina
5 years ago
Bai 9850633350 [Update] 添加LDAP USER_QUERY_FIELD字段值为username，解决数据库因大小敏感导致LDAP用户认证首次成功，再次失败的问题；如果不配置此字段，则查询使用小写，创建可能会使用大写，最终导致username重复而创建用户失败；
5 years ago
ibuler 5f2345852d Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
ibuler ad1c17aa7b feat: 仅支持fields_size=mini,small
5 years ago
xinwen 3a79bfd5f6
[Update] 添加一些 i18n (#4052)
5 years ago
Bai 5ee8519274 [Update] 修改AccessKey序列类
5 years ago
Bai ff546774e9 Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina
5 years ago
Bai 1f4fc9b6f0 [Update] 修改API-Key序列类
5 years ago
xinwen f8142e23cd
[Fix] 权限管理-> 资产与数据库 Bug (#4049)
5 years ago
Bai 196f1654ab Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina
5 years ago
Bai 3b8a24eeb7 [Update] 添加用户profile public-key序列类
5 years ago
xinwen 7dde15cb04
[Feature] 权限管理-> 远程应用 添加 api (#4040)
5 years ago
Bai 3e5d949610 [Update] 添加用户profile password序列类
5 years ago
Bai 25c3691f6b Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina
5 years ago
Bai f3bc6c0b22 [Update] 修改用户profile序列类
5 years ago
ibuler caf0d85939 [feat] 修改remote app, database app的过滤参数
5 years ago
ibuler a463f632e8 [Update] 优化重定向
5 years ago
ibuler a0e6d09770 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
Bai 7afff5e392 [Update] merge from dev to lina
5 years ago
ibuler 9a5fee5a4c Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
ibuler a840e611cd [Update] 修改core 的base url
5 years ago
Bai 566419cac4 Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina
5 years ago
Bai 7b362bfc76 [Update] 用户序列类添加mfa相关字段
5 years ago
ibuler f528dd4888 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
ibuler 3c95c6fe11 [Feat] 添加失效用户权限的api
5 years ago
老广 71a72dd957
Merge pull request #4033 from jumpserver/update-i18n
5 years ago
xinwen 93453cc8c3 [Update] perms.serializers.asset_permission.AssetPermissionSerializer 添加字段
5 years ago
xinwen 11527b9033 [Update] i18n
5 years ago
ibuler 2ff2266417 [Update] 修改 SerializerMixin 还原之前的更改
5 years ago
ibuler 3320e6105c [Update] 删掉没用的内容
5 years ago
xinwen 492b1c4311 [Update] org retrieve api
5 years ago
xinwen 7b0993959e [Update] orgs.serializers.OrgReadSerializer add `id`
5 years ago
ibuler 701582fe38 [Update] 修改license的判断方法
5 years ago
ibuler b371676813 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
Bai 2e0eab9289 [Update] 修改翻译信息
5 years ago
ibuler 0cac8d66b3 [Update] 修改index api
5 years ago
Bai 7c44f74068 [Bugfix] 修复只显示当前节点下资产不生效的问题
5 years ago
xinwen 245d28b03d [Update] 一些本地化
5 years ago
Bai 75f4f6d0a2 [Update] 资产授权序列类is_expired, is_valid设置为read_only
5 years ago
Bai f9e167cb0e Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina
5 years ago
Bai f224e49de7 [Update] 去掉资产授权序列类中不存在的字段
5 years ago
Bai 63ff868553 [Update] 授权资产树返回org_id字段值
5 years ago
Bai b97deec1de [Update] openid 继续使用配置项 base_site_url
5 years ago
Bai be3fdac8a9 [Update] 修复API-key不能删除的问题
5 years ago
Bai 96afd82341 [Update] 修复任务列表，执行历史中stat汇总数据显示问题
5 years ago
Bai 728e4b7edd [Update] 修复授权模块的信号处理监听不到的问题
5 years ago
Bai 73c3de97b8 [Update] 取消用户资产页面中，资产详情系统用户值为undefine的问题
5 years ago
Bai e98626988b [Update] 解决开启OpenID，为用户强制启用MFA导致，登录时报错的问题
5 years ago
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