Commit Graph

4896 Commits (3648a1458b81559edcc1cf57c3e4b7a1093fc51f)
 

Author SHA1 Message Date
老广 4944ac8e75 Config (#3502)
5 years ago
BaiJiangJie a88db3d9db
Merge pull request #3501 from jumpserver/dev
5 years ago
BaiJiangJie fd1b9d97c0
Merge pull request #3500 from jumpserver/dev_c
5 years ago
BaiJiangJie 5e95f262b2 [Update] 更新配置文件
5 years ago
BaiJiangJie 4493a82425
Merge pull request #3497 from jumpserver/dev
5 years ago
BaiJiangJie 078751979e
Merge pull request #3496 from jumpserver/gateway_bug
5 years ago
jym503558564 1fd98ae404 [Update] 修复获取网关bug
5 years ago
BaiJiangJie 560de55c3c
Merge pull request #3495 from jumpserver/dev
5 years ago
BaiJiangJie dd6e0f548c
Merge pull request #3494 from jumpserver/dev_bai
5 years ago
BaiJiangJie a07a90f1c9 [Update] 修改用户详情中审批人设置显示条件
5 years ago
BaiJiangJie 64642ab48b
Merge pull request #3492 from jumpserver/dev
5 years ago
BaiJiangJie 12f51c9474
Merge pull request #3491 from jumpserver/dev_v
5 years ago
BaiJiangJie 50106474d4 [Update] 修改版本号(1.5.5)
5 years ago
BaiJiangJie b3e2b30e71
Merge pull request #3488 from jumpserver/1.5.5
5 years ago
BaiJiangJie 7427f02e0b
Merge pull request #3489 from jumpserver/bai_1.5.5
5 years ago
BaiJiangJie 330c078597 [Update] Merge dev
5 years ago
BaiJiangJie eb05588776
Merge pull request #3486 from jumpserver/dev
5 years ago
BaiJiangJie 98d3a36d98
Merge pull request #3485 from jumpserver/task_search
5 years ago
jym503558564 fedf50f9dc [Update] 修复任务列表页面无法搜索问题
5 years ago
BaiJiangJie 1876b7dfba
Merge pull request #3483 from jumpserver/gateway_search
5 years ago
BaiJiangJie 873d909879
Merge pull request #3449 from jumpserver/user_detail_template
5 years ago
jym503558564 15b8a2efb9 [Update] 修改小问题
5 years ago
BaiJiangJie 45444149dd
Merge pull request #3482 from jumpserver/domain_search
5 years ago
jym503558564 a5485011c8 [Update] 修复网关搜索报500错误;密码为空时,测试连接报500错误
5 years ago
jym503558564 7c5592fa36 [Update] 修复网域列表页面无法搜索问题
5 years ago
ibuler 715b04e2b2 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler 73086328e4 [Update] 去掉elfinder包
5 years ago
BaiJiangJie 7f126ab652
Merge pull request #3475 from jumpserver/dev_bai
5 years ago
BaiJiangJie 5bcd122de9 [Update] 修改Dockerfile,安装 wheel 依赖
5 years ago
jym503558564 a92aec2775 Merge branch 'dev' into user_detail_template
5 years ago
jym503558564 cc9554cdb4 [Update] 修改用户详情页中添加用户组标签的显示条件是:当前组织的普通用户或组管理员
5 years ago
BaiJiangJie 100dd24ff5
Merge pull request #3457 from jumpserver/dev
5 years ago
BaiJiangJie 3a812c2267
Merge pull request #3456 from jumpserver/dev_bai
5 years ago
BaiJiangJie f47781a330 [Update] 发送重置密钥邮件时,清除用户公钥
5 years ago
BaiJiangJie f96dd15f20
Merge pull request #3454 from jumpserver/1.5.5_bai
5 years ago
BaiJiangJie ffdc1eb198 [Update] 修改工单管理列表可以按照类型排序 以及 日期显示格式
5 years ago
BaiJiangJie 91d1a62c98
Merge pull request #3453 from jumpserver/dev
5 years ago
BaiJiangJie 793adbccab
Merge pull request #3452 from jumpserver/dev
5 years ago
BaiJiangJie 72ea036a29
Merge pull request #3451 from jumpserver/dev_bai
5 years ago
BaiJiangJie 9e322323f3 [Update] LDAP 分页获取 cookie 取值添加异常捕获
5 years ago
BaiJiangJie 6951f4dd97 [Update] 删除 LDAP 查询时抛出的自定义异常类( LDAPOUGroupException),解决多有 OU 下导入用户时的问题
5 years ago
jym503558564 54887a3460 [Update] 修改用户详情页中用户组标签不显示的问题
5 years ago
老广 dafe71af42
Merge pull request #3446 from jumpserver/dev
5 years ago
ibuler 82b9c2519b [Update] Merge it
5 years ago
ibuler d563a11acf [Update] 修改jms
5 years ago
老广 c5438fd65d
Merge pull request #3445 from jumpserver/dev
5 years ago
ibuler 66b8e59ae7 [Update] 修改nav
5 years ago
ibuler e424315d93 [Update] 修改用户列表serializer
5 years ago
ibuler 4c801bb828 [Update] 修改用户列表
5 years ago
ibuler 1bba00412a [Update] 修改user list 页面字段宽度
5 years ago