github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-08-18 22:28:28 +00:00
Code Issues Projects Releases Wiki Activity
5,506 Commits 85 Branches 259 Tags 128 MiB
5c46ff20de
Commit Graph

5506 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xinwen
5c46ff20de fix(orgs): org-member-relation url 拼写错误 2020-11-03 17:58:13 +08:00
xinwen
074121b957 fix(perms): 重建授权树冲突时，响应里加 code 2020-11-03 17:53:20 +08:00
xinwen
0eff79c47a perf(perms): 优化用户授权资产列表加载速度 2020-10-31 09:54:07 +08:00
xinwen
10ff7730ec perf(perms): 优化根据资产获取授权的系统用户 2020-10-30 00:38:05 -05:00
root
4f70e313b4 modify: AttributeError: 'UUID' object has no attribute 'name' 2020-10-26 06:18:25 -05:00
xinwen
c225fd584d fix(assets): 系统用户与用户组发生变化时报错 2020-10-26 05:30:46 -05:00
xinwen
8ed6a64a9e fix(assets): 资产列表添加默认 date_created 排序 2020-10-23 02:24:24 -05:00
ibuler
d7e97629aa fix(perms): 修复asset permission导入的bug 2020-10-20 14:50:36 +08:00
ibuler
2c20889540 fix(perms): 修复用户的资产不区分组织的问题 2020-10-19 21:50:31 -05:00
Bai
7d325856b9 perf(config): 升级依赖redis==3.5.3; 添加CACHES配置: health_check_interval=30; 解决因网络不稳定导致的redis连接失败异常 2020-10-19 04:45:01 -05:00
xinwen
28879d9314 fix(orgs): 更新用户时org_roles参数为None时不更新组织角色 2020-10-18 22:23:27 -05:00
Jiangjie.Bai
32fab08ed3
Merge pull request #4802 from jumpserver/dev 
chore: merge dev to master
 2020-10-15 14:08:36 +08:00
fit2bot
8943850ca9
perf(Dockerfile): 去掉多余的代码 (#4801) 
* perf(Dockerfile): 优化构建docker,经常变动的包不使用镜像

Co-authored-by: ibuler <ibuler@qq.com>
 2020-10-15 14:05:11 +08:00
ibuler
8fff57813a perf(Dockerfile): 优化构建docker,经常变动的包不使用镜像 2020-10-15 00:59:58 -05:00
xinwen
9128210e87
Merge pull request #4798 from jumpserver/dev 
Dev to master
 2020-10-15 12:22:00 +08:00
xinwen
e3dd03f4c7
Dev (#4791) 
* fix(xpack): 修复last login太长的问题 (#4786)

Co-authored-by: ibuler <ibuler@qq.com>

* perf: 更新密码中也发送邮件 (#4789)

Co-authored-by: ibuler <ibuler@qq.com>

* fix(terminal): 修复获取螺旋的异步api

* fix(terminal): 修复有的录像存储有问题的导致下载录像的bug

* fix(orgs): 修复组织添加用户bug

* perf(requirements): 修改jms-storage==0.0.34 (#4797)

Co-authored-by: Bai <bugatti_it@163.com>

Co-authored-by: fit2bot <68588906+fit2bot@users.noreply.github.com>
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Bai <bugatti_it@163.com>
 2020-10-15 12:00:38 +08:00
fit2bot
aabb2aff1f
perf(requirements): 修改jms-storage==0.0.34 (#4797) 
Co-authored-by: Bai <bugatti_it@163.com>
 2020-10-15 11:51:45 +08:00
xinwen
f8bbca38e3 fix(orgs): 修复组织添加用户bug 2020-10-14 22:50:55 -05:00
ibuler
12b180ddea fix(terminal): 修复有的录像存储有问题的导致下载录像的bug 2020-10-15 11:48:52 +08:00
ibuler
4917769964 fix(terminal): 修复获取螺旋的异步api 2020-10-15 11:48:52 +08:00
fit2bot
5868d56e18
perf: 更新密码中也发送邮件 (#4789) 
Co-authored-by: ibuler <ibuler@qq.com>
 2020-10-14 19:59:05 +08:00
fit2bot
bab76f3cda
fix(xpack): 修复last login太长的问题 (#4786) 
Co-authored-by: ibuler <ibuler@qq.com>
 2020-10-14 19:58:44 +08:00
xinwen
475c0e4187
Merge pull request #4784 from jumpserver/dev 
Dev
 2020-10-14 15:59:21 +08:00
老广
3d070231f4
Merge pull request #4783 from jumpserver/pr@dev@chore_merge 
chore: merge with master
 2020-10-14 02:55:28 -05:00
ibuler
c5b0cafabd chore: merge with master 2020-10-14 15:53:06 +08:00
ibuler
a69bba8702 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2020-10-14 15:48:32 +08:00
xinwen
cfd0098019 fix(perms): 修复一次性获取所有资产与节点sql泛滥问题 2020-10-14 02:43:22 -05:00
ibuler
52f1dcf662 fix(users): 修复邀请用户的bug 2020-10-14 15:31:24 +08:00
xinwen
373c6c77e0 fix(perms): 未激活资产不能使用 2020-10-13 19:34:19 +08:00
xinwen
f3d052554d fix(perms): 修复失效资产授权action 还在的问题 2020-10-13 19:34:19 +08:00
xinwen
a57ce482dd fix(assets): 资产树批量删除资产数量不对 2020-10-13 19:34:19 +08:00
xinwen
a449d97f67 fix(orgs): 组织添加成员bug 2020-10-13 19:34:19 +08:00
ibuler
84e4238848 fix(ops): 修复任务schedule属性的bug 2020-10-13 19:34:19 +08:00
clannon
82dd1c35ea Update config_example.yml 
SECRET_KEY 和 BOOTSTRAP_TOKEN 后面默认留个空格，遇到好几个新手对yaml格式不注意了，虽然是个小问题……
 2020-10-13 19:34:19 +08:00
ibuler
5ac974a44c fix(deps): 修复依赖版本 2020-10-13 19:34:19 +08:00
fit2bot
c4caeb92ee perf: 优化生成假数据 (#4759) 
* perf: 优化生成假数据
 2020-10-13 19:34:19 +08:00
ibuler
f4799d90c0 fix(assets): 修复点击节点更新硬件信息的bug 2020-10-13 19:34:19 +08:00
ibuler
f97685c788 perf(orgs): 优化组织用户添加 2020-10-13 19:34:19 +08:00
ibuler
0439376326 feat(users): 添加用户suggetion api 2020-10-13 19:34:19 +08:00
xinwen
dd2413edd8 fix(perms): 授权树与资产列表的一些 bug 2020-10-13 19:34:19 +08:00
xinwen
459c5c07c9 fix(perms): 未激活资产不能使用 2020-10-13 06:30:18 -05:00
xinwen
ef86a49c1e fix(perms): 修复失效资产授权action 还在的问题 2020-10-13 06:20:43 -05:00
xinwen
0ad389515b fix(assets): 资产树批量删除资产数量不对 2020-10-13 05:47:54 -05:00
xinwen
2432b9a553 fix(orgs): 组织添加成员bug 2020-10-13 03:38:25 -05:00
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