xinwen
|
962ea67b84
|
refactor(authentication): 密码解密抽取成方法
|
2020-08-12 18:27:41 +08:00 |
xinwen
|
31720c9dcc
|
feat(assets): 系统用户添加 `home` `system_groups` 字段
|
2020-08-12 15:05:46 +08:00 |
xinwen
|
54fe4835f6
|
fix(authentication): `SSO`登录添加 `next_url`
|
2020-08-11 19:36:34 +08:00 |
xinwen
|
91649a3908
|
feat(applications): 添加 k8s 应用
|
2020-08-11 12:56:54 +08:00 |
xinwen
|
0a242c3e81
|
fix(audis): 生成操作日志时间字段索引迁移脚本
|
2020-08-11 11:27:19 +08:00 |
huamaolin
|
25d1b3334f
|
fix(OperateLog): 修复操作日志按时间查询慢
增加表OperateLog datetime字段索引
|
2020-08-10 19:28:26 -07:00 |
xinwen
|
ffde306a04
|
fix(assets): 修复批量删除资产失败问题
|
2020-08-11 10:15:14 +08:00 |
xinwen
|
f1e29a91f7
|
fix(users): 用户接口添加汇总角色字段
|
2020-08-07 18:53:03 +08:00 |
xinwen
|
ec2b3b4cda
|
fix(user): 调整`User`接口字段
|
2020-08-07 13:57:22 +08:00 |
xinwen
|
1a9d9e4145
|
feat(ticket): 申请资产工单添加`actions`字段
|
2020-08-06 15:21:54 +08:00 |
xinwen
|
a14f121fad
|
fix(orgs): 组织成员关系接口添加`role_display`字段
|
2020-08-05 19:24:28 +08:00 |
xinwen
|
a25da8d479
|
feat(authentication): 超级管理员密码不能是`admin`
|
2020-08-05 17:23:58 +08:00 |
fit2bot
|
15fe7f810b
|
perf(url): 优化 /api/docs/? 都可以访问文档 (#4446)
Co-authored-by: ibuler <ibuler@qq.com>
|
2020-08-05 14:09:23 +08:00 |
xinwen
|
f6a4253936
|
feat(ticket): 工单关闭生成 Comment
|
2020-08-05 11:13:23 +08:00 |
xinwen
|
c3c5801d2e
|
refactor(orgs): 重构组织与用户关系接口
|
2020-08-04 11:33:15 +08:00 |
ibuler
|
8ee7230ead
|
fix(auth): 修复radius decode error的问题
|
2020-08-03 10:31:44 +08:00 |
xinwen
|
90f03dda62
|
feat(authentication): 类似腾讯企业邮单点登录功能
|
2020-07-31 19:37:51 +08:00 |
xinwen
|
2ed0927b18
|
fix(login): 用户登录堡垒机的时候偶尔会出现“密码解密失败”,导致无法正常登录。 #4408
|
2020-07-29 17:54:59 +08:00 |
xinwen
|
e98235ca27
|
refactor(serializer): 设置 `BulkSerializerMixin` 的默认 `ListSerializer` 为 `AdaptedBulkListSerializer`
|
2020-07-29 17:09:48 +08:00 |
xinwen
|
1b052a8729
|
feat(terminal): 终端管理添加批量更新接口
|
2020-07-29 15:14:50 +08:00 |
xinwen
|
34b188bbe7
|
fix(csv): 修复`JMSCSVParser`调用`serializer`导致循环调用问题
|
2020-07-29 10:45:41 +08:00 |
xinwen
|
f8e248f0af
|
feat(ticket): 调整申请资产工单
|
2020-07-28 19:19:37 +08:00 |
xinwen
|
b331730422
|
fix(users): 替换旧有角色常量
|
2020-07-28 18:24:53 +08:00 |
xinwen
|
de3865fa1d
|
refactor(orgs): 重构组织表结构
|
2020-07-28 10:16:26 +08:00 |
xinwen
|
1bc913ab13
|
feat(perms): 资产授权添加GUI复制粘贴动作
|
2020-07-27 15:24:09 +08:00 |
OrangeM21
|
2f11a70341
|
fix(authentication): 调整登录页面样式
|
2020-07-24 18:39:17 +08:00 |
xinwen
|
c277aec561
|
feat(authenticaion): 添加登录页面验证码与MFA开关
|
2020-07-24 17:40:41 +08:00 |
ibuler
|
2a53a20808
|
perf(assets): 修改 系统用户 管理用户 等的用户名长度到128
|
2020-07-24 11:40:36 +08:00 |
Bai
|
674ad40f67
|
fix(perms): 修复perms api UserPermissionMixin 中 kwargs 参数传递(未发现引出其他问题)
|
2020-07-23 11:09:01 +08:00 |
github-actions
|
78089e01a3
|
fix(cas): 修复cas校验不同的问题
|
2020-07-22 17:20:39 +08:00 |
老广
|
5d08438dad
|
feat(ops): 项目启动时,清除指定的celery定时任务;添加获取celery定时任务的函数 (#4378)
* feat(ops): 添加获取celery定时任务的函数
* feat(ops): 项目启动时,清除指定的celery定时任务
* feat(ops): 项目启动时,清除指定的celery定时任务 2
Co-authored-by: Bai <bugatti_it@163.com>
|
2020-07-21 15:33:33 +08:00 |
Bai
|
3e541162e3
|
fix(authentication): 修复用户认证Radius认证中参数传递错误问题 *kwargs -> **kwargs
|
2020-07-21 10:30:19 +08:00 |
BaiJiangJie
|
0fca33d874
|
fix(radius): 修复radius认证失败问题 (#4342)
* fix(radius): 修复radius认证失败问题,添加get_django_user方法参数(django-radius==1.4.0 中添加了额外参数)
* fix(radius): 修复radius认证失败问题,重写authenticate方法(django-radius 不接受public_key参数)
|
2020-07-16 17:07:40 +08:00 |
Bai
|
bb60d2a1d9
|
fix(users): 组织管理员创建用户时,角色只能选择: 用户
|
2020-07-15 20:14:14 +08:00 |
xinwen
|
0014bd0cb9
|
fix(audits): 操作日志中的动作搜索条件,删除文件字段改成删除 (#4334)
|
2020-07-15 20:13:21 +08:00 |
xinwen
|
9488c8bd97
|
fix(cmd_filter): 命令过滤器唯一应该为 name + org_id (#4325)
|
2020-07-15 20:04:46 +08:00 |
Bai
|
1f30d459ae
|
fix(command): 修复命令记录没有根据sesion进行过滤的问题
|
2020-07-15 17:30:55 +08:00 |
Bai
|
4e933fc1ca
|
feat(session + db): 会话搜索添加登录来源选项
|
2020-07-15 17:25:43 +08:00 |
Bai
|
c0f3a1f64a
|
fix(all): 修复创建资源时,created_by字段长度限制导致创建失败的问题
|
2020-07-15 16:27:40 +08:00 |
Bai
|
0f70f5eccf
|
fix(orgs): 删除组织失败时返回对应错误信息
|
2020-07-15 16:25:34 +08:00 |
Bai
|
eef942c155
|
fix(gather_asset_users): 修复收集资产用户日志中用户名显示不完整的问题
|
2020-07-15 16:16:11 +08:00 |
xinwen
|
061592fa6b
|
fix(terminal): 移除`CommandQueryMixin.get_filter_fields`
|
2020-07-14 19:35:18 +08:00 |
Bai
|
ddcd4ebbfc
|
fix(asset_user): 修改创建AuthBook对象锁机制,使用select_for_update替换redis_lock3
|
2020-07-14 19:06:06 +08:00 |
Bai
|
9550ea62fb
|
fix(asset_user): 修改创建AuthBook对象锁机制,使用select_for_update替换redis_lock2
|
2020-07-14 19:06:06 +08:00 |
Bai
|
abcb589658
|
fix(asset_user): 修改创建AuthBook对象锁机制,使用select_for_update替换redis_lock
|
2020-07-14 19:06:06 +08:00 |
Bai
|
1bb366ad94
|
fix(authbook): 修改创建AuthBook对象锁机制,解决并发操作堵塞问题
|
2020-07-14 19:06:06 +08:00 |
xinwen
|
a5df7738f6
|
fix(audits): 日志审计模块 `Serializer` 添加 `org_id` 字段
|
2020-07-14 18:05:21 +08:00 |
xinwen
|
da858c8998
|
fix(tickets): 隐藏申请资产工单URL (#4307)
|
2020-07-13 17:49:00 +08:00 |
BaiJiangJie
|
724a8f6324
|
fix(assets): 修复用户name字段长度与资产created_by字段长度不一致导致创建资产失败的问题 (#4302)
* fix(assets): 修复用户name字段长度与资产created_by字段长度不一致导致创建资产失败的问题
* fix(assets): 修复用户name字段长度与资产created_by字段长度不一致导致创建资产失败的问题(修改迁移文件名称 0050_auto_20200702_1602.py -> 0051_auto_20200713_1143.py)
|
2020-07-13 12:00:44 +08:00 |
ibuler
|
437df9a533
|
fix(assets): node asset 关系发生变化是,关联系统用户引起的问题
|
2020-07-10 17:31:51 +08:00 |
Bai
|
7c12f8f462
|
merge: Merge to dev from branch master
|
2020-07-09 14:27:08 +08:00 |
xinwen
|
6f5a92c21f
|
[Update] assets/gathered_user 添加过滤字段
|
2020-07-09 14:08:46 +08:00 |
xinwen
|
17a76994dc
|
[Update] 系统用户添加过滤字段
|
2020-07-09 14:08:46 +08:00 |
jym503558564
|
39d793bc47
|
fix:修改 ftp 日志按开始日期排序
|
2020-07-09 14:08:46 +08:00 |
xinwen
|
c3eafbee8c
|
[Fix] X-Pack/云管中心 i18n
|
2020-07-09 14:08:46 +08:00 |
xinwen
|
8eb6cfa9c9
|
fix(ticket): 修改工单获取系统用户的字段 (#4274)
fix(ticket): 申请资产工单修改bug
|
2020-07-09 14:06:06 +08:00 |
xinwen
|
f430c9e435
|
Merge pull request #4270 from jumpserver/request-asset-ticket-dev
feat(ticket): 添加申请资产工单
|
2020-07-08 15:42:04 +08:00 |
Bai
|
a30c603bdc
|
fix(user_group): 用户组中添加用户,取消审计员的限制
|
2020-07-08 15:17:07 +08:00 |
xinwen
|
39a75074af
|
[Feature] 添加申请资产工单
|
2020-07-08 15:09:44 +08:00 |
Bai
|
8c7240193a
|
fix(system_user): 修复系统用户测试可连接性失败问题(所有资产)(不应该执行校验系统用户是否可以推送的逻辑)
|
2020-07-08 11:30:37 +08:00 |
Bai
|
b622aca9af
|
fix(admin_user): 修复管理用户单独测试某台资产可连接性失败的情况(private_key_file)
|
2020-07-08 10:48:25 +08:00 |
Bai
|
69f49f7776
|
feat(i18n): 修改翻译
|
2020-07-07 14:13:20 +08:00 |
Bai
|
fcd684e2db
|
feat(assets): 资产序列类修改字段名 _name 为 _display
|
2020-07-07 11:09:43 +08:00 |
Bai
|
1c264399bb
|
feat(domain + migrate): 修改网域唯一字段为:org_id + name
|
2020-07-02 18:51:16 +08:00 |
Bai
|
872e2546e9
|
feat(node): NodeModel添加方法get_or_create_child()
|
2020-07-02 18:49:17 +08:00 |
BaiJiangJie
|
8f347eee4d
|
Merge pull request #4216 from jumpserver/dev_org
feat(Cloud): 组织管理ViewSet添加搜索字段
|
2020-07-01 14:57:50 +08:00 |
Bai
|
caf312c5be
|
feat(Cloud): 组织管理ViewSet添加搜索字段
|
2020-07-01 14:38:03 +08:00 |
Bai
|
ac6168a06c
|
feat(Command execute): 批量命令执行配置添加默认值True
|
2020-07-01 11:19:57 +08:00 |
Bai
|
b46e772d09
|
feat(login password ecrypt): 登录密码加密传输 4
|
2020-06-30 18:35:01 +08:00 |
Bai
|
183df82a75
|
feat(login password ecrypt): 登录密码加密传输 3
|
2020-06-30 18:14:53 +08:00 |
Bai
|
98c91d0f18
|
feat(login password ecrypt): 登录密码加密传输(添加翻译)
|
2020-06-30 17:37:16 +08:00 |
Bai
|
e17d875206
|
feat(login password ecrypt): 登录密码加密传输2
|
2020-06-30 17:23:56 +08:00 |
Bai
|
4b1e84ed8a
|
Merge branch 'dev' into dev_login_password_encrypt
|
2020-06-30 17:13:08 +08:00 |
Bai
|
71ee33e3be
|
feat(login password ecrypt): 登录密码加密传输
|
2020-06-30 17:12:38 +08:00 |
xinwen
|
2b6e818943
|
[Update] 限制上传CSV文件的大小
|
2020-06-28 19:02:20 +08:00 |
BaiJiangJie
|
89496baae5
|
Merge pull request #4148 from jumpserver/v2.0
V2.0
|
2020-06-28 10:47:56 +08:00 |
Bai
|
cf6aba1f38
|
[Update] 修改csv导出,最大限制条目数从100->10000条
|
2020-06-28 10:43:47 +08:00 |
xinwen
|
6e3369c944
|
[Update] sftp log页面操作翻译
|
2020-06-24 17:22:53 +08:00 |
Bai
|
c0a153d13a
|
[Update] UserProfileAPI 判断是否设置session过期时间,解决前端关闭浏览器session未失效的问题
|
2020-06-24 10:52:05 +08:00 |
xinwen
|
32ed43ba7b
|
Merge branch 'v2.0' into fix-mfa-1.5
|
2020-06-22 19:04:42 +08:00 |
xinwen
|
3e993fd044
|
[Update] 调整`MFA`绑定策略 V2
|
2020-06-22 19:02:14 +08:00 |
xinwen
|
005573b53b
|
[Fix] 重新绑定 MFA 的漏洞
|
2020-06-22 18:03:45 +08:00 |
BaiJiangJie
|
c4bd093fd7
|
Merge pull request #4126 from jumpserver/v2.0
V2.0
|
2020-06-20 19:26:12 +08:00 |
Michael Bai
|
f1e5c7c2bb
|
添加改密计划安全模式配置项
|
2020-06-20 16:18:58 +08:00 |
Michael Bai
|
fcb0aefe3c
|
更改改密计划安全模式配置项名
|
2020-06-20 15:47:39 +08:00 |
Bai
|
29666cc8d3
|
[Update] 添加改密计划安全模式配置项
|
2020-06-19 20:41:51 +08:00 |
xinwen
|
1d640eccf6
|
[Fix] `/opt/jumpserver/apps/jumpserver/views/index.py redirect(assets:user-asset-list)` (#4121)
|
2020-06-19 18:28:43 +08:00 |
Bai
|
64064cb526
|
[Update] 注释节点树print
|
2020-06-17 17:47:45 +08:00 |
Eric_Lee
|
46941037dd
|
add SECURITY_COMMAND_EXECUTION (#4114)
|
2020-06-17 15:03:41 +08:00 |
xinwen
|
8ad71b6dd9
|
[Update] Move LOCAL_DYNAMIC_SETTINGS (#4113)
|
2020-06-16 18:11:23 +08:00 |
ibuler
|
220ccda04d
|
fix: 修改domain创建的assets不是必填的
|
2020-06-16 17:55:18 +08:00 |
Eric_Lee
|
6d30fe797c
|
fix ldap test bug (#4110)
|
2020-06-16 17:25:57 +08:00 |
xinwen
|
3318df1771
|
[Fix] 日志审计/FTP日志 (#4109)
|
2020-06-16 16:33:53 +08:00 |
Eric_Lee
|
0ccd806eca
|
add system user perm api (#4108)
|
2020-06-16 16:12:59 +08:00 |
xinwen
|
7ebe1c2916
|
[Update] 优化 dynamic settings (#4107)
|
2020-06-16 15:54:19 +08:00 |
ibuler
|
08904c2a9f
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
|
2020-06-16 15:30:39 +08:00 |
ibuler
|
19e34270d1
|
feat: gather user添加搜索字段
|
2020-06-16 15:30:25 +08:00 |
Bai
|
afa515d570
|
Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev
|
2020-06-16 15:04:38 +08:00 |
Bai
|
bcba408517
|
[Update] 修改用户source默认local
|
2020-06-16 15:04:01 +08:00 |
ibuler
|
80d94074e7
|
feat: 修改资产的标签搜索
|
2020-06-16 14:56:19 +08:00 |
ibuler
|
9347405f08
|
feat: terminal增加搜索
|
2020-06-16 13:50:21 +08:00 |
ibuler
|
da4ad11a69
|
fix: 修改session command 翻译
|
2020-06-16 13:39:49 +08:00 |
ibuler
|
b81e424e80
|
fix: 修改翻译
|
2020-06-16 12:20:16 +08:00 |
ibuler
|
1f15937139
|
feat: 修改翻译,添加settings
|
2020-06-16 11:04:59 +08:00 |
Bai
|
f4fa011714
|
[Update] 修改mfa校验code无效翻译
|
2020-06-15 20:31:50 +08:00 |
xinwen
|
c5a9a85818
|
[Update] 完善 作业中心/任务列表 (#4105)
|
2020-06-15 19:42:36 +08:00 |
ibuler
|
e23bfa0f69
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
|
2020-06-15 17:55:13 +08:00 |
ibuler
|
451690fe8b
|
fix: 修改重定向
|
2020-06-15 17:44:40 +08:00 |
Eric_Lee
|
5bea782b9f
|
add assignee field for ticket (#4104)
|
2020-06-15 17:24:05 +08:00 |
Bai
|
f26f7ca1e7
|
[Update] 修改parsers,处理dict字段值;解决remote-app csv导入时异常
|
2020-06-15 16:34:51 +08:00 |
Bai
|
927ca162d0
|
[Update] 修改MFA应用下载图片
|
2020-06-15 13:55:56 +08:00 |
Bai
|
583d295fd1
|
Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev
|
2020-06-15 13:50:05 +08:00 |
Bai
|
b51af1f7d7
|
[Update] 修改MFA应用下载图片
|
2020-06-15 13:49:51 +08:00 |
xinwen
|
edcf9921fe
|
[Update] apps/assets/serializers/system_user.py (#4102)
|
2020-06-15 13:24:52 +08:00 |
Eric_Lee
|
eef172d0e2
|
Merge pull request #4098 from jumpserver/fix-ops-adhoc
[Fix] ops.models.adhoc (#4096)
|
2020-06-12 12:23:05 +08:00 |
Eric_Lee
|
5b407fe8bc
|
Merge pull request #4095 from jumpserver/update-user
[Update] 修改 用户相关 Serializer
|
2020-06-12 12:22:16 +08:00 |
Bai
|
1bb9048910
|
[Update] 标签序列类assets字段required为False
|
2020-06-12 11:45:03 +08:00 |
xinwen
|
787cdbcadf
|
[Fix] ops.models.adhoc (#4096)
|
2020-06-12 11:44:29 +08:00 |
xinwen
|
b14ca14120
|
[Fix] ops.models.adhoc (#4096)
|
2020-06-11 20:30:59 +08:00 |
ibuler
|
4b2fd0d0da
|
fix: 修复系统用户过滤权限规则的bug
|
2020-06-11 19:36:34 +08:00 |
xinwen
|
3393f18399
|
[Update] 修改 用户相关 Serializer
|
2020-06-11 18:24:56 +08:00 |
ibuler
|
7e1a379e47
|
feat: 修改org返回的数据结构
|
2020-06-11 18:05:18 +08:00 |
ibuler
|
213fdd461b
|
fix: 修改翻译
|
2020-06-11 14:33:42 +08:00 |
ibuler
|
148c7ffb43
|
fix: 添加注释
|
2020-06-11 14:10:55 +08:00 |
ibuler
|
75be45ce43
|
feat: 使用新的对称加密方式: aes
|
2020-06-11 12:10:00 +08:00 |
ibuler
|
04eb670ada
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
|
2020-06-11 11:29:28 +08:00 |
ibuler
|
66f3706142
|
feat: 添加aes fix: 修改时区的bug
|
2020-06-11 11:28:37 +08:00 |
xinwen
|
9ea98bf2b2
|
[Feature] 添加 会话管理/历史会话/下载 api (#4093)
|
2020-06-10 17:34:56 +08:00 |
ibuler
|
4695f80172
|
faet: 修改翻译
|
2020-06-10 17:17:16 +08:00 |
ibuler
|
0452d53c3f
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
|
2020-06-10 16:00:24 +08:00 |
ibuler
|
ec30ef1f8b
|
feat: readme添加版本说明
|
2020-06-10 15:57:41 +08:00 |
Eric_Lee
|
1c0ad08d80
|
fix ldap test i18n msg (#4092)
|
2020-06-10 15:10:43 +08:00 |
ibuler
|
e1ab453780
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
|
2020-06-10 12:58:43 +08:00 |
ibuler
|
1a6597b572
|
feat: 修改command filter数据结构
|
2020-06-10 12:58:18 +08:00 |
xinwen
|
865522953a
|
[Feature] 作业中心/任务列表/任务详情 最后运行成功或失败的主机 (#4090)
|
2020-06-09 20:26:23 +08:00 |
ibuler
|
4d4a107101
|
feat: 修改oid获取顺序,添加从cookie中获取
|
2020-06-09 16:43:07 +08:00 |
ibuler
|
82f70cb0dc
|
feat: ticket添加翻译
|
2020-06-09 16:10:31 +08:00 |
ibuler
|
820186c6d0
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
|
2020-06-09 15:16:01 +08:00 |
ibuler
|
4468e2d379
|
feat: 限制gateway 仅有ssh协议
|
2020-06-09 15:08:15 +08:00 |
Eric_Lee
|
bd802e6a50
|
add logo urls (#4088)
|
2020-06-09 14:06:11 +08:00 |
ibuler
|
9362c272cb
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
|
2020-06-09 10:19:07 +08:00 |
ibuler
|
ee4534ac4b
|
feat: public setting添加key
|
2020-06-09 10:17:16 +08:00 |
xinwen
|
7ef09a4ca1
|
[Update] UserSerializer 添加 login_confirm_settings (#4086)
|
2020-06-08 17:16:30 +08:00 |
ibuler
|
31daaed4cd
|
feat: 添加auth confirm 到public setting
|
2020-06-08 16:48:10 +08:00 |
ibuler
|
71202e83f5
|
feat: 修改用户的api
|
2020-06-05 20:15:23 +08:00 |
ibuler
|
b1640e5592
|
fix: 修改common resource api的权限,否则auditor无法使用
|
2020-06-05 14:43:40 +08:00 |
ibuler
|
076b7babcb
|
修改批量命令的api
|
2020-06-05 14:20:34 +08:00 |
ibuler
|
8569910658
|
feat: command exexution audit log的搜索
|
2020-06-05 14:07:23 +08:00 |
xinwen
|
34c556d375
|
[Fix] spm (#4082)
|
2020-06-05 10:42:03 +08:00 |
ibuler
|
a43d6ad34d
|
feat: 资产添加admin_user_display
|
2020-06-04 20:26:42 +08:00 |
ibuler
|
ca6825008b
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
|
2020-06-04 20:00:48 +08:00 |
ibuler
|
9c6f118dbd
|
feat: 添加批量命令的relation
|
2020-06-04 20:00:39 +08:00 |
Bai
|
5730e60089
|
[Update] 修改用户profile序列类
|
2020-06-04 17:24:31 +08:00 |
Bai
|
afc7f3bb9c
|
[Update] 修改用户public_key生成密钥的view
|
2020-06-04 17:05:36 +08:00 |
Bai
|
c411b0a38e
|
Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev
|
2020-06-04 17:02:52 +08:00 |
Bai
|
403b6fc563
|
[Update] 修改用户更新Public_key的条件判断
|
2020-06-04 17:02:43 +08:00 |
xinwen
|
55ae8bb5e6
|
[Fix] 系统设置/邮件设置/测试链接失败 (#4081)
|
2020-06-04 16:47:43 +08:00 |
Eric_Lee
|
dbcf785e42
|
add flower view (#4078)
|
2020-06-04 15:10:02 +08:00 |
ibuler
|
e6cd126045
|
feat: 修改api的权限
|
2020-06-04 14:55:33 +08:00 |
Bai
|
420f3c0c4c
|
[Update] 添加celery task log view
|
2020-06-04 14:30:44 +08:00 |
Bai
|
9b2c5cb305
|
[Update] 修改用户profile序列类3
|
2020-06-03 21:00:37 +08:00 |
Bai
|
907f0068db
|
[Update] 修改用户profile序列类2
|
2020-06-03 20:21:28 +08:00 |
Bai
|
a16b3260ba
|
Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev
|
2020-06-03 18:20:43 +08:00 |
Bai
|
1845821f6c
|
[Update] 修改用户profile序列类
|
2020-06-03 18:20:33 +08:00 |
ibuler
|
27d906a877
|
feat: 去掉js i18n catalog
|
2020-06-03 16:26:10 +08:00 |
xinwen
|
431ba36a26
|
[Fix] 会话管理/命令记录 时间过滤 bug (#4070)
|
2020-06-03 15:05:55 +08:00 |
Eric_Lee
|
229c782157
|
change PAGE_SIZE_CHOICE to string value (#4069)
|
2020-06-03 14:06:44 +08:00 |
ibuler
|
5bacab7475
|
fix: 重置密钥到auth中
|
2020-06-03 12:44:45 +08:00 |
ibuler
|
999286a089
|
fix: 修复用户公钥错误引起的profile bug
|
2020-06-03 12:32:52 +08:00 |
ibuler
|
68ccaf0cb3
|
feat: 去掉第一次登录的那个导航
|
2020-06-03 12:26:53 +08:00 |
ibuler
|
8d58d58519
|
feat: 修改profile view
|
2020-06-03 11:58:16 +08:00 |
ibuler
|
8efc0331de
|
feat: 删掉所有view, templates, forms
|
2020-06-03 11:43:43 +08:00 |
ibuler
|
7c479c2479
|
feat: 修改docs的url
|
2020-06-03 11:17:00 +08:00 |
ibuler
|
96551856a2
|
[Update] 部分view放到auth中
|
2020-06-03 11:06:44 +08:00 |
ibuler
|
b1f5cc7728
|
[Update] 禁用view
|
2020-06-03 10:38:44 +08:00 |
ibuler
|
1a84661ca9
|
feat: 修改filterset_fields => filter_fields,option方法不支持filterset
|
2020-06-02 20:02:22 +08:00 |
ibuler
|
50bea55732
|
merge: with dev
|
2020-06-02 15:43:42 +08:00 |
ibuler
|
a4ece2b271
|
feat: audits中添加id字段
|
2020-06-02 15:41:27 +08:00 |
xinwen
|
b460e4abaa
|
[Fix] 日志审计 日期过滤与排序bug (#4063)
|
2020-06-02 15:40:07 +08:00 |
BaiJiangJie
|
087ba9ae95
|
Merge pull request #4059 from jumpserver/lina
Lina
|
2020-06-01 14:05:22 +08:00 |
Bai
|
9850633350
|
[Update] 添加LDAP USER_QUERY_FIELD字段值为username,解决数据库因大小敏感导致LDAP用户认证首次成功,再次失败的问题;如果不配置此字段,则查询使用小写,创建可能会使用大写,最终导致username重复而创建用户失败;
|
2020-06-01 12:06:39 +08:00 |
ibuler
|
5f2345852d
|
Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
|
2020-06-01 11:41:55 +08:00 |
ibuler
|
ad1c17aa7b
|
feat: 仅支持fields_size=mini,small
|
2020-06-01 10:10:28 +08:00 |
xinwen
|
3a79bfd5f6
|
[Update] 添加一些 i18n (#4052)
|
2020-05-29 15:18:25 +08:00 |
Bai
|
5ee8519274
|
[Update] 修改AccessKey序列类
|
2020-05-29 14:04:50 +08:00 |
Bai
|
ff546774e9
|
Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina
|
2020-05-28 20:46:30 +08:00 |
Bai
|
1f4fc9b6f0
|
[Update] 修改API-Key序列类
|
2020-05-28 20:46:17 +08:00 |
xinwen
|
f8142e23cd
|
[Fix] 权限管理-> 资产与数据库 Bug (#4049)
|
2020-05-28 19:08:48 +08:00 |
Bai
|
196f1654ab
|
Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina
|
2020-05-28 17:47:27 +08:00 |
Bai
|
3b8a24eeb7
|
[Update] 添加用户profile public-key序列类
|
2020-05-28 17:47:18 +08:00 |
xinwen
|
7dde15cb04
|
[Feature] 权限管理-> 远程应用 添加 api (#4040)
* [Feature] 权限管理-> 远程应用 添加 api
* [Feature] 添加 RelationMixin
|
2020-05-28 17:00:42 +08:00 |
Bai
|
3e5d949610
|
[Update] 添加用户profile password序列类
|
2020-05-28 16:10:28 +08:00 |
Bai
|
25c3691f6b
|
Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina
|
2020-05-28 15:03:07 +08:00 |
Bai
|
f3bc6c0b22
|
[Update] 修改用户profile序列类
|
2020-05-28 15:02:53 +08:00 |
ibuler
|
caf0d85939
|
[feat] 修改remote app, database app的过滤参数
|
2020-05-28 14:47:30 +08:00 |
ibuler
|
a463f632e8
|
[Update] 优化重定向
|
2020-05-27 20:33:09 +08:00 |
ibuler
|
a0e6d09770
|
Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
|
2020-05-27 19:51:45 +08:00 |
Bai
|
7afff5e392
|
[Update] merge from dev to lina
|
2020-05-27 18:44:12 +08:00 |
ibuler
|
9a5fee5a4c
|
Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
|
2020-05-27 18:03:14 +08:00 |
ibuler
|
a840e611cd
|
[Update] 修改core 的base url
|
2020-05-27 18:02:18 +08:00 |
Bai
|
566419cac4
|
Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina
|
2020-05-27 17:27:38 +08:00 |
Bai
|
7b362bfc76
|
[Update] 用户序列类添加mfa相关字段
|
2020-05-27 17:27:28 +08:00 |
ibuler
|
f528dd4888
|
Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
|
2020-05-26 19:00:00 +08:00 |
ibuler
|
3c95c6fe11
|
[Feat] 添加失效用户权限的api
|
2020-05-26 18:56:03 +08:00 |
老广
|
71a72dd957
|
Merge pull request #4033 from jumpserver/update-i18n
[Update] i18n
|
2020-05-25 01:53:02 -05:00 |
xinwen
|
93453cc8c3
|
[Update] perms.serializers.asset_permission.AssetPermissionSerializer 添加字段
|
2020-05-25 14:50:07 +08:00 |
xinwen
|
11527b9033
|
[Update] i18n
|
2020-05-22 18:18:40 +08:00 |
ibuler
|
2ff2266417
|
[Update] 修改 SerializerMixin 还原之前的更改
|
2020-05-21 20:35:44 +08:00 |
ibuler
|
3320e6105c
|
[Update] 删掉没用的内容
|
2020-05-21 19:00:47 +08:00 |
xinwen
|
492b1c4311
|
[Update] org retrieve api
|
2020-05-21 16:09:42 +08:00 |
xinwen
|
7b0993959e
|
[Update] orgs.serializers.OrgReadSerializer add `id`
|
2020-05-21 15:40:41 +08:00 |
ibuler
|
701582fe38
|
[Update] 修改license的判断方法
|
2020-05-21 14:47:00 +08:00 |
ibuler
|
b371676813
|
Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
|
2020-05-20 19:35:48 +08:00 |
Bai
|
2e0eab9289
|
[Update] 修改翻译信息
|
2020-05-20 19:35:35 +08:00 |
ibuler
|
0cac8d66b3
|
[Update] 修改index api
|
2020-05-20 19:35:33 +08:00 |
Bai
|
7c44f74068
|
[Bugfix] 修复只显示当前节点下资产不生效的问题
|
2020-05-20 18:20:01 +08:00 |
xinwen
|
245d28b03d
|
[Update] 一些本地化
|
2020-05-20 17:45:50 +08:00 |
Bai
|
75f4f6d0a2
|
[Update] 资产授权序列类is_expired, is_valid设置为read_only
|
2020-05-19 20:50:33 +08:00 |
Bai
|
f9e167cb0e
|
Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina
|
2020-05-19 20:36:41 +08:00 |
Bai
|
f224e49de7
|
[Update] 去掉资产授权序列类中不存在的字段
|
2020-05-19 20:36:17 +08:00 |
Bai
|
63ff868553
|
[Update] 授权资产树返回org_id字段值
|
2020-05-19 19:36:19 +08:00 |
Bai
|
b97deec1de
|
[Update] openid 继续使用配置项 base_site_url
|
2020-05-19 18:24:26 +08:00 |
Bai
|
be3fdac8a9
|
[Update] 修复API-key不能删除的问题
|
2020-05-19 15:28:31 +08:00 |
Bai
|
96afd82341
|
[Update] 修复任务列表,执行历史中stat汇总数据显示问题
|
2020-05-19 15:15:17 +08:00 |
Bai
|
728e4b7edd
|
[Update] 修复授权模块的信号处理监听不到的问题
|
2020-05-19 11:47:49 +08:00 |
Bai
|
73c3de97b8
|
[Update] 取消用户资产页面中,资产详情系统用户值为undefine的问题
|
2020-05-18 18:14:19 +08:00 |
Bai
|
e98626988b
|
[Update] 解决开启OpenID,为用户强制启用MFA导致,登录时报错的问题
|
2020-05-18 18:02:37 +08:00 |
Bai
|
01a52812f0
|
[Update] 修改用户MFA禁用/更新的View
|
2020-05-18 15:49:53 +08:00 |
Bai
|
041d99f0be
|
[Update] 更新remote-app用户/用户组时自动刷新页面
|
2020-05-18 15:40:54 +08:00 |
Bai
|
75edc26a10
|
[Update] 修改翻译,禁用资产提示不支持ansible的错误提示
|
2020-05-18 15:25:24 +08:00 |
Bai
|
2f7b169405
|
[Update] 修改授权用户/用户组页面删除用户组失败的问题
|
2020-05-18 15:24:55 +08:00 |
ibuler
|
76ef9b292b
|
[Update] 修改public api
|
2020-05-18 14:55:16 +08:00 |
ibuler
|
1540cbdcaa
|
[Update] 修改csv render
|
2020-05-18 11:52:50 +08:00 |
Bai
|
e951b64b0a
|
[Update] 修改版本号1.5.9
|
2020-05-14 16:14:17 +08:00 |
ibuler
|
5d129fd0da
|
Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
|
2020-05-14 14:51:05 +08:00 |
ibuler
|
b529127461
|
[Update] 修改user role
|
2020-05-14 14:49:54 +08:00 |
Bai
|
d878089ebd
|
[Update] 用户资产详情Modal添加comment
|
2020-05-14 14:26:00 +08:00 |
Bai
|
4658a4c90f
|
[Update] 修改向导文案
|
2020-05-14 11:00:24 +08:00 |
Bai
|
d06ea2944e
|
[Update] 修改Dashboard API
|
2020-05-14 10:53:30 +08:00 |
ibuler
|
154aad1e22
|
Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
|
2020-05-13 11:06:24 +08:00 |
ibuler
|
17163dd909
|
[Update] 用户Profile添加在当前组织的角色
|
2020-05-13 11:05:58 +08:00 |
Bai
|
9341ce9f84
|
[Update] 修复AssetUserViewSet 使用Option方法时error
|
2020-05-12 20:31:32 +08:00 |
ibuler
|
195cbbbe42
|
[Update] 修改profile serialzier
|
2020-05-12 17:57:35 +08:00 |
xinwen
|
eb74d13059
|
[Update] Asset filter 添加 platform__base 字段
|
2020-05-12 17:24:51 +08:00 |
xinwen
|
4dd6d4498b
|
[Update] Asset filter 添加 platform__name 字段
|
2020-05-12 17:09:36 +08:00 |
ibuler
|
dd5bf546df
|
[Update] 修改serialzier_class
|
2020-05-12 15:37:37 +08:00 |
ibuler
|
d6debde566
|
Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
|
2020-05-11 19:28:24 +08:00 |
ibuler
|
efc66cc7ee
|
[Update] 默认关闭debug
|
2020-05-11 19:28:02 +08:00 |
Bai
|
4bd2681bf0
|
[Update] Merge from dev to lina
|
2020-05-11 17:43:48 +08:00 |
Bai
|
98e3adbb11
|
[Update] Merge from master to dev
|
2020-05-11 17:38:01 +08:00 |