Commit Graph

5483 Commits (3d070231f4685aa04839a0ed11351c160c284960)
 

Author SHA1 Message Date
老广 3d070231f4
Merge pull request #4783 from jumpserver/pr@dev@chore_merge
4 years ago
ibuler c5b0cafabd chore: merge with master
4 years ago
ibuler a69bba8702 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
4 years ago
xinwen cfd0098019 fix(perms): 修复一次性获取所有资产与节点sql泛滥问题
4 years ago
ibuler 52f1dcf662 fix(users): 修复邀请用户的bug
4 years ago
xinwen 373c6c77e0 fix(perms): 未激活资产不能使用
4 years ago
xinwen f3d052554d fix(perms): 修复失效资产授权action 还在的问题
4 years ago
xinwen a57ce482dd fix(assets): 资产树批量删除资产数量不对
4 years ago
xinwen a449d97f67 fix(orgs): 组织添加成员bug
4 years ago
ibuler 84e4238848 fix(ops): 修复任务schedule属性的bug
4 years ago
clannon 82dd1c35ea Update config_example.yml
4 years ago
ibuler 5ac974a44c fix(deps): 修复依赖版本
4 years ago
fit2bot c4caeb92ee perf: 优化生成假数据 (#4759)
4 years ago
ibuler f4799d90c0 fix(assets): 修复点击节点更新硬件信息的bug
4 years ago
ibuler f97685c788 perf(orgs): 优化组织用户添加
4 years ago
ibuler 0439376326 feat(users): 添加用户suggetion api
4 years ago
xinwen dd2413edd8 fix(perms): 授权树与资产列表的一些 bug
4 years ago
xinwen 459c5c07c9 fix(perms): 未激活资产不能使用
4 years ago
xinwen ef86a49c1e fix(perms): 修复失效资产授权action 还在的问题
4 years ago
xinwen 0ad389515b fix(assets): 资产树批量删除资产数量不对
4 years ago
xinwen 2432b9a553 fix(orgs): 组织添加成员bug
4 years ago
ibuler 12216a718a Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
4 years ago
ibuler 2190db1bb5 fix(ops): 修复任务schedule属性的bug
4 years ago
ibuler 5d36537404 fix(ops): 修复任务schedule属性的bug
4 years ago
clannon 5a87634c26 Update config_example.yml
4 years ago
老广 e5eb84999a
Merge pull request #4768 from jumpserver/pr@dev@chore_merge_with_master
4 years ago
ibuler 426a86b52d Merge branch 'master' into dev
4 years ago
ibuler f84acfe282 fix(deps): 修复依赖版本
4 years ago
fit2bot c73b49fe30
perf: 优化生成假数据 (#4759)
4 years ago
ibuler 98238f71ae fix(assets): 修复点击节点更新硬件信息的bug
4 years ago
ibuler 66e45f1c80 perf(orgs): 优化组织用户添加
4 years ago
ibuler 93a400f6e6 feat(users): 添加用户suggetion api
4 years ago
xinwen 535d7d8373 fix(perms): 授权树与资产列表的一些 bug
4 years ago
Bai db268280b4 perf(requirements): 修改依赖包Pillow==7.1.0
4 years ago
Bai 873789bdab perf(requirements): 修改依赖包Pillow==7.1.0
4 years ago
Jiangjie.Bai 6584890ab1
Merge pull request #4754 from jumpserver/dev
4 years ago
fit2bot 96d5c519ec
perf(i18n): 添加翻译信息 (#4748)
4 years ago
Bai 6e91217303 perf(authentication): 修改用户登录页面,使用其他方式认证时点击忘记密码提示联系管理员
4 years ago
xinwen 5dd1dfc59e fix(orgs): 用户修改组织角色报错
4 years ago
Bai a53e930950 perf(tickets): 申请资产工单支持授权多个系统用户
4 years ago
xinwen 8f52f79d91 fix(migrations): 增加迁移脚本
4 years ago
xinwen 3af0e68c84 fix(perms): 用户授权树bug
4 years ago
Bai 3ccf32ed48 feat(authentication): 用户重置密码成功后,发送用户重置密码成功邮件
4 years ago
xinwen d52ed2ffb9 fix(xpack): GatheredUser 点击资产树报错
4 years ago
ibuler 38588151d1 继续修改issue template
4 years ago
ibuler 2a95aca28f chore: 修改issue模板
4 years ago
Bai 1915224063 fix(terminal): 修复正在使用的命令/录像存储可以被删除的问题
4 years ago
fit2bot da4f9efb42
fix(perms): 修改检查资产授权过期策略 (#4722)
4 years ago
fit2bot 579c2c1d7a
feat(celery): 保证同时只有一个beat在运行 (#4723)
4 years ago
xinwen 2a86c3a376 fix(perms): 完善检查资产授权过期的celery task
4 years ago