github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
6,910 Commits
70 Branches
249 Tags
114 MiB
Commit Graph

6910 Commits (46e119db1f3de66dade79b66623bef529c85a0ca)

Author SHA1 Message Date
ibuler e0d4ad8570 workflow: 优化workflow 2021-12-07 10:40:13 +08:00
ibuler 3c8726f1b0 fix: 去掉多余的 collect static 
perf: 使用bash 才能保证 subprocess 运行正常
 2021-12-06 19:03:23 +08:00
ibuler 6b4bc1bdb5 chore: 升级 License 到 GPLv3 
chore: 升级 License 到 GPLv3
 2021-12-06 18:15:17 +08:00
ibuler c92d36391f chore: change license 2021-12-06 17:45:54 +08:00
xinwen 24bbe7c31f fix: 计算docker limit 内存使用率时区分 cgroup v1 v2 2021-12-06 11:22:45 +08:00
fit2bot 77f2bd9262
perf: 优化workflow名称 (#7323) 
* workflow: 添加定时检查issue的workflow

* perf: 优化workflow名称

Co-authored-by: ibuler <ibuler@qq.com>
 2021-12-06 10:09:58 +08:00
ibuler 495a6fbc95 workflow: 添加定时检查issue的workflow 2021-12-03 19:25:56 +08:00
xinwen 36c6299a03 fix: redis 锁在redis集群环境报错 2021-12-03 19:23:44 +08:00
ibuler 8a31fbe35e chore: 添加判断 pull request 2021-12-03 15:22:13 +08:00
ibuler dbe628a8db chore: 添加 issue 备注添加labels 2021-12-03 15:22:13 +08:00
ibuler e45b893662 chore: 添加 workflow 检查issue 2021-12-02 17:50:31 +08:00
feng626 ac4b6e5b96 feat: 工单创建资产添加节点 2021-11-30 16:38:30 +08:00
ibuler c85249be36 perf: 优化订阅处理，形成框架 2021-11-29 15:01:37 +08:00
ibuler de006bc664 perf: 资产添加标签显示，更加易读 
pref: 添加翻译
 2021-11-29 14:57:50 +08:00
xinwen a313e011ef perf: 内存使用率兼顾 docker cgroup limit 2021-11-29 14:53:04 +08:00
Michael Bai 3076b7a5e1 fix: 修复migrations序号重复问题 2021-11-29 11:24:12 +08:00
老广 c47a588e7c
Merge pull request #7289 from jumpserver/pr@dev@merge_with_master 
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
 2021-11-26 11:20:39 +08:00
ibuler 7f61c49db2 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2021-11-25 20:00:34 +08:00
ibuler c8a76c9afb fix: 修复 close connection 的问题 2021-11-25 18:29:01 +08:00
ibuler 3e85a9a079 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2021-11-25 18:05:18 +08:00
ibuler 62cbca7eb2 fix: 修复重置 mfa 的提示问题 2021-11-25 17:50:47 +08:00
ibuler 434793bc41 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2021-11-25 17:44:51 +08:00
xinwen 85a017b2c4 fix: 按资产ip搜索数据不全 2021-11-25 17:29:47 +08:00
ibuler 84bce19a92 perf: 去掉登录页面更好 2021-11-25 16:02:40 +08:00
ibuler 3874b8ed67 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 
repr@dev_v2.16_v2.15@2ee26971c9b152@fix_xxxx
merges an updated upstream into a topic branch.
 2021-11-25 15:58:33 +08:00
ibuler 7f0ad7e27f fix: 修复 oidc cas 登录时跳转问题 
perf: 优化一波，容易debug

perf: 还原回来的世界
 2021-11-25 15:01:42 +08:00
ibuler 2ee26971c9 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2021-11-24 20:41:41 +08:00
ibuler 5ace5a752e fix: 修复 cas/oidc 登录 MFA 产生的bug 
perf: 优化更严谨
 2021-11-24 19:05:15 +08:00
Michael Bai e838d974c3 fix: 修复根据节点/资产查询授权时报错的问题 2021-11-24 19:04:42 +08:00
ibuler 9dd93ea3b8 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2021-11-24 16:15:57 +08:00
jiangweidong 88ea7ae149 feat: 云管同步中心支持OpenStack资产同步，所需python库依赖 2021-11-24 14:28:11 +08:00
ibuler 1132c6a4e4 fix: 修复 mfa radius 登录的bug 2021-11-24 12:51:12 +08:00
ibuler 0762f87ba5 Merge branch 'master' into dev 2021-11-24 11:25:51 +08:00
chenqiao cb98b4f80a feat:新增对sqlserver数据库托管 2021-11-24 11:21:04 +08:00
feng626 599d58e9f2 fix: 修复重置mfa 500 bug 2021-11-23 16:11:54 +08:00
ibuler 5c6f1730d5 perf: 系统用户密码不再trim空格 2021-11-23 10:41:58 +08:00
feng626 67d084fc43 perf: ip list 优化 2021-11-19 16:36:58 +08:00
feng626 24d0d52a0a perf: 优化ip黑白名单 2021-11-19 11:48:45 +08:00
xinwen d94c515cfc fix: 验证码逻辑错误 2021-11-19 10:46:59 +08:00
Michael Bai cae956f9a5 fix(i18n): 修改翻译文件 2021-11-18 19:07:14 +08:00
Jiangjie.Bai 2c70e117c6
Merge pull request #7229 from jumpserver/dev 
v2.16
 2021-11-18 18:51:57 +08:00
ibuler 70e8a03888 fix: 修复 mfa 登录时的 focus 错误 2021-11-18 18:49:22 +08:00
fit2bot d2df8acd84
fix: 修复数据库连接没有关闭问题 (#7227) 
* fix: 修复数据库连接没有关闭的bug

perf: websocket 断开也添加关闭数据库连接

* fix: 修复数据库连接没有关闭问题

Co-authored-by: ibuler <ibuler@qq.com>
 2021-11-18 18:47:01 +08:00
Michael Bai 6e5dcc738e fix: 修改ldap分页日志为debug模式 2021-11-18 18:07:51 +08:00
Jiangjie.Bai d1ccb4af15
Merge pull request #7224 from jumpserver/dev 
v2.16.0 rc4
 2021-11-18 17:05:35 +08:00
fit2bot 086ecfc046
perf: 优化全局ip限制逻辑 (#7220) 
* perf: 优化全局ip限制逻辑

* perf: 优化全局ip限制逻辑 2

* perf: 优化全局ip限制逻辑 3

Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: Michael Bai <baijiangjie@gmail.com>
 2021-11-18 16:55:23 +08:00
Jiangjie.Bai 8f3765a98d
Merge pull request #7217 from jumpserver/dev 
v2.16.0 rc3
 2021-11-18 13:02:51 +08:00
Michael Bai 2d6610b133 fix(settings): 修复LDAP系统设置中使用search_ou查询前执行strip操作 2021-11-18 13:01:20 +08:00
Jiangjie.Bai 5a82174c54
Merge pull request #7214 from jumpserver/dev 
v2.16.0 rc2
 2021-11-17 19:42:25 +08:00
Michael Bai dac45f234a fix: 终端列表指标数值保留一位小数 2021-11-17 19:36:52 +08:00