ibuler
|
12216a718a
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
|
2020-10-13 10:52:18 +08:00 |
ibuler
|
2190db1bb5
|
fix(ops): 修复任务schedule属性的bug
|
2020-10-12 21:51:31 -05:00 |
ibuler
|
5d36537404
|
fix(ops): 修复任务schedule属性的bug
|
2020-10-12 19:08:13 +08:00 |
clannon
|
5a87634c26
|
Update config_example.yml
SECRET_KEY 和 BOOTSTRAP_TOKEN 后面默认留个空格,遇到好几个新手对yaml格式不注意了,虽然是个小问题……
|
2020-10-12 05:23:49 -05:00 |
老广
|
e5eb84999a
|
Merge pull request #4768 from jumpserver/pr@dev@chore_merge_with_master
Merge branch 'master' into dev
|
2020-10-12 05:22:25 -05:00 |
ibuler
|
426a86b52d
|
Merge branch 'master' into dev
|
2020-10-12 18:19:58 +08:00 |
ibuler
|
f84acfe282
|
fix(deps): 修复依赖版本
|
2020-10-12 05:13:52 -05:00 |
fit2bot
|
c73b49fe30
|
perf: 优化生成假数据 (#4759)
* perf: 优化生成假数据
|
2020-10-12 12:44:30 +08:00 |
ibuler
|
98238f71ae
|
fix(assets): 修复点击节点更新硬件信息的bug
|
2020-10-11 22:31:08 -05:00 |
ibuler
|
66e45f1c80
|
perf(orgs): 优化组织用户添加
|
2020-10-12 11:25:43 +08:00 |
ibuler
|
93a400f6e6
|
feat(users): 添加用户suggetion api
|
2020-10-12 11:18:11 +08:00 |
xinwen
|
535d7d8373
|
fix(perms): 授权树与资产列表的一些 bug
|
2020-10-11 21:43:44 -05:00 |
Bai
|
db268280b4
|
perf(requirements): 修改依赖包Pillow==7.1.0
|
2020-10-08 22:06:43 -05:00 |
Bai
|
873789bdab
|
perf(requirements): 修改依赖包Pillow==7.1.0
|
2020-10-08 22:04:23 -05:00 |
Jiangjie.Bai
|
6584890ab1
|
Merge pull request #4754 from jumpserver/dev
Dev
|
2020-10-09 10:37:47 +08:00 |
fit2bot
|
96d5c519ec
|
perf(i18n): 添加翻译信息 (#4748)
* perf(i18n): 添加翻译信息
* perf(users): 重置密码成功邮件添加DEBUG信息
* perf(i18n): 修改翻译信息
* perf(i18n): 修改翻译信息
Co-authored-by: Bai <bugatti_it@163.com>
|
2020-09-30 16:11:03 +08:00 |
Bai
|
6e91217303
|
perf(authentication): 修改用户登录页面,使用其他方式认证时点击忘记密码提示联系管理员
|
2020-09-30 02:05:14 -05:00 |
xinwen
|
5dd1dfc59e
|
fix(orgs): 用户修改组织角色报错
|
2020-09-30 11:40:52 +08:00 |
Bai
|
a53e930950
|
perf(tickets): 申请资产工单支持授权多个系统用户
|
2020-09-29 19:11:20 +08:00 |
xinwen
|
8f52f79d91
|
fix(migrations): 增加迁移脚本
|
2020-09-29 17:48:19 +08:00 |
xinwen
|
3af0e68c84
|
fix(perms): 用户授权树bug
|
2020-09-29 17:25:00 +08:00 |
Bai
|
3ccf32ed48
|
feat(authentication): 用户重置密码成功后,发送用户重置密码成功邮件
|
2020-09-29 16:28:14 +08:00 |
xinwen
|
d52ed2ffb9
|
fix(xpack): GatheredUser 点击资产树报错
|
2020-09-29 16:26:02 +08:00 |
ibuler
|
38588151d1
|
继续修改issue template
|
2020-09-29 14:28:27 +08:00 |
ibuler
|
2a95aca28f
|
chore: 修改issue模板
|
2020-09-29 14:18:14 +08:00 |
Bai
|
1915224063
|
fix(terminal): 修复正在使用的命令/录像存储可以被删除的问题
|
2020-09-29 13:37:48 +08:00 |
fit2bot
|
da4f9efb42
|
fix(perms): 修改检查资产授权过期策略 (#4722)
* fix(perms): 修改检查资产授权过期策略
* perf: 优化一行代码
Co-authored-by: xinwen <coderWen@126.com>
Co-authored-by: ibuler <ibuler@qq.com>
|
2020-09-29 13:34:55 +08:00 |
fit2bot
|
579c2c1d7a
|
feat(celery): 保证同时只有一个beat在运行 (#4723)
* feat(celery): 保证同时只有一个beat在运行
* fix: 修复代码拼写错误
* fix: 修复拼写
* fix: remove import
Co-authored-by: ibuler <ibuler@qq.com>
|
2020-09-29 13:33:53 +08:00 |
xinwen
|
2a86c3a376
|
fix(perms): 完善检查资产授权过期的celery task
|
2020-09-29 11:44:20 +08:00 |
Bai
|
5558e854de
|
perf(permms): 应用授权树返回授权应用的总数量
|
2020-09-29 11:43:31 +08:00 |
xinwen
|
31b6c3b679
|
feat(celery): 设置 node_tree celery work 为 2
|
2020-09-28 18:49:40 +08:00 |
fit2bot
|
2209a2c8d2
|
feat(orgs): 修改OrgMemberRelationAPI,支持通过查询参数控制是否忽略已存在的数据 (#4720)
* feat(orgs): 修改OrgMemberRelationAPI,支持通过查询参数控制是否忽略已存在的数据
* feat(orgs): 修改构建数据库查询参数的问题
Co-authored-by: Bai <bugatti_it@163.com>
|
2020-09-28 18:49:18 +08:00 |
xinwen
|
f596b65ed7
|
feat(auth): sso 生成的地址重复访问的时候,重定向到用户指定的 next 地址
|
2020-09-28 16:20:32 +08:00 |
fit2bot
|
2c9c64a13f
|
fix(jms): 启动脚本 task 添加 celery_node_tree, check_asset_perm_expired 两个 worker (#4716)
* fix(jms): 启动脚本 task 添加 celery_node_tree, check_asset_perm_expired 两个 worker
* fix: 修改脚本
Co-authored-by: xinwen <coderWen@126.com>
Co-authored-by: ibuler <ibuler@qq.com>
|
2020-09-28 16:19:49 +08:00 |
xinwen
|
1d49b3deca
|
fix(perms): 用户搜索全部授权资产报错
|
2020-09-28 13:17:45 +08:00 |
xinwen
|
6701a1b604
|
fix(perms): 用户添加到用户组报错
|
2020-09-27 20:53:34 +08:00 |
ibuler
|
b8ff3b38bf
|
fix: 修复middleware引起的bug
|
2020-09-27 17:58:41 +08:00 |
fit2bot
|
d3be16ffe8
|
fix (#4680)
* perf(perms): 资产授权列表关联数据改为 `prefetch_related`
* perf(perms): 优化一波
* dispatch_mapping_node_tasks.delay
* perf: 在做一些优化
* perf: 再优化一波
* perf(perms): 授权更改节点慢的问题
* fix: 修改一处bug
* perf(perms): ungrouped 资产数量计算方式
* fix: 修复dispatch data中的bug
* fix(assets): add_nodes_assets_to_system_users celery task
* fix: 修复ungrouped的bug
* feat(nodes): 添加 favorite 节点
* feat(node): 添加 favorite api
* fix: 修复clean keys的bug
Co-authored-by: xinwen <coderWen@126.com>
Co-authored-by: ibuler <ibuler@qq.com>
|
2020-09-27 16:02:44 +08:00 |
老广
|
e3648d11b1
|
feat: 录像存储server类型,可以设置如何存储了 (#4699)
feat: Server 类型的录像存储可以上传到 oss等上面
|
2020-09-27 14:34:47 +08:00 |
fit2bot
|
d4037998c8
|
perf: 优化middleware的使用 (#4707)
perf: 优化middleware的使用
|
2020-09-27 14:34:05 +08:00 |
fit2bot
|
82de636b5c
|
perf(common): 检查referer (#4697)
Co-authored-by: ibuler <ibuler@qq.com>
|
2020-09-27 11:48:21 +08:00 |
Bai
|
91f1280f97
|
perf(settings): public setting API返回LOGIN_TITLE字段
|
2020-09-27 11:37:38 +08:00 |
fit2bot
|
7c82f5aa2b
|
chore: 修改issue template (#4703)
* chore: 修改issue template
* perf: 又修改了些
Co-authored-by: ibuler <ibuler@qq.com>
|
2020-09-25 16:09:56 +08:00 |
老广
|
6a801eaf33
|
Update issue templates
|
2020-09-25 15:47:43 +08:00 |
xinwen
|
28da819735
|
perf(assets): 优化节点树
修改树策略,做读优化,写的速度降低
|
2020-09-21 10:23:09 +08:00 |
Jiangjie.Bai
|
cdf3cf3e8f
|
Merge pull request #4667 from jumpserver/dev
fix(command): 修复命令导出选中项问题
|
2020-09-16 19:55:18 +08:00 |
Bai
|
118564577e
|
fix(command): 修复命令导出选中项问题
|
2020-09-16 19:53:58 +08:00 |
Jiangjie.Bai
|
47f2df0a5b
|
Merge pull request #4665 from jumpserver/dev
fix(command): 修复命令导出选中项问题
|
2020-09-16 19:38:16 +08:00 |
Bai
|
e4aafc236d
|
fix(command): 修复命令导出选中项问题
|
2020-09-16 19:36:21 +08:00 |
Jiangjie.Bai
|
b1c530bba8
|
Merge pull request #4661 from jumpserver/dev
Dev
|
2020-09-16 19:03:38 +08:00 |