github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
6,316 Commits
64 Branches
246 Tags
105 MiB
Commit Graph

6316 Commits (44044a7d995c2b198e2ceeb66ce8310d992eb641)

Author SHA1 Message Date
xinwen f7e6c14bc5 fix(assets): 向资产推送系统用户bug 2020-10-28 21:40:40 -05:00
xinwen f6031d6f5d fix(logger): 把 drf 异常放到单独的日志文件中 2020-10-28 21:26:35 -05:00
xinwen 5e779e6542 fix(systemuser): 系统用户添加 ad_domain 字段 2020-10-28 21:23:29 -05:00
xinwen 7031b7f28b fix(auth): 修复用户登录失败次数出现0次 2020-10-28 06:06:57 -05:00
xinwen e2f540a1f4 fix(assets): 网关的密码不能包含特殊字符 2020-10-28 06:05:53 -05:00
ibuler 108a1da212 chore: 修改github 语言识别 2020-10-26 20:51:09 -05:00
xinwen b4a8cb768b fix(assets): 系统用户与用户组发生变化时报错 2020-10-26 05:31:30 -05:00
xinwen 6b2f606430 fix(tickets): 工单申请资产授权通过人显示不对 2020-10-26 02:03:12 -05:00
xinwen 70a8db895d fix(migrations): 生成一下遗漏的 migrations 2020-10-23 17:00:37 +08:00
xinwen 0043dc6110 fix(assets): 资产列表添加默认 `date_created` 排序 2020-10-23 17:00:37 +08:00
xinwen 87d2798612 fix(assets): 资产列表不能用到`assets_amount`字段 2020-10-23 16:54:19 +08:00
ibuler e2d8eee629 fix(i18n): 修改收藏夹的翻译 2020-10-23 16:52:06 +08:00
xinwen 8404db8cef fix(assets): 修改 `AssetViewSet.filter_fields` 2020-10-23 02:25:04 -05:00
Bai fd7f379b10 perf(requirements): 升级依赖django-timezone-field==4.0 2020-10-21 13:01:28 +08:00
ibuler 111c63ee6a perf: 修改beat版本 2020-10-20 15:02:11 +08:00
ibuler 4eb5d51840 fix: domain端口可能随便填写的问题 2020-10-20 15:01:06 +08:00
ibuler 7f53a80855 fix: 修改textfield 不再限制长度 2020-10-20 15:00:22 +08:00
ibuler 90afabdcb2 fix(perms): 修复用户的资产不区分组织的问题 2020-10-20 14:56:23 +08:00
ibuler de405be753 fix(perms): 修复asset permission导入的bug 2020-10-20 14:46:31 +08:00
Bai f84b845385 perf(config): 升级依赖redis==3.5.3; 添加CACHES配置: health_check_interval=30; 解决因网络不稳定导致的redis连接失败异常 2020-10-19 04:45:34 -05:00
xinwen b1ac3fa94f fix(orgs): 更新用户时`org_roles`参数为`None`时不更新组织角色 2020-10-15 04:59:25 -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