github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
5,439 Commits
69 Branches
249 Tags
112 MiB
Commit Graph

2691 Commits (873789bdab5d1f3aaf622162f67dea79c66c47d2)

Author SHA1 Message Date
ibuler ec30ef1f8b feat: readme添加版本说明 2020-06-10 15:57:41 +08:00
Eric_Lee 1c0ad08d80
fix ldap test i18n msg (#4092) 2020-06-10 15:10:43 +08:00
ibuler e1ab453780 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2020-06-10 12:58:43 +08:00
ibuler 1a6597b572 feat: 修改command filter数据结构 2020-06-10 12:58:18 +08:00
xinwen 865522953a
[Feature] 作业中心/任务列表/任务详情 最后运行成功或失败的主机 (#4090) 2020-06-09 20:26:23 +08:00
ibuler 4d4a107101 feat: 修改oid获取顺序，添加从cookie中获取 2020-06-09 16:43:07 +08:00
ibuler 82f70cb0dc feat: ticket添加翻译 2020-06-09 16:10:31 +08:00
ibuler 820186c6d0 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2020-06-09 15:16:01 +08:00
ibuler 4468e2d379 feat: 限制gateway 仅有ssh协议 2020-06-09 15:08:15 +08:00
Eric_Lee bd802e6a50
add logo urls (#4088) 2020-06-09 14:06:11 +08:00
ibuler 9362c272cb Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2020-06-09 10:19:07 +08:00
ibuler ee4534ac4b feat: public setting添加key 2020-06-09 10:17:16 +08:00
xinwen 7ef09a4ca1
[Update] UserSerializer 添加 login_confirm_settings (#4086) 2020-06-08 17:16:30 +08:00
ibuler 31daaed4cd feat: 添加auth confirm 到public setting 2020-06-08 16:48:10 +08:00
ibuler 71202e83f5 feat: 修改用户的api 2020-06-05 20:15:23 +08:00
ibuler b1640e5592 fix: 修改common resource api的权限，否则auditor无法使用 2020-06-05 14:43:40 +08:00
ibuler 076b7babcb 修改批量命令的api 2020-06-05 14:20:34 +08:00
ibuler 8569910658 feat: command exexution audit log的搜索 2020-06-05 14:07:23 +08:00
xinwen 34c556d375
[Fix] spm (#4082) 2020-06-05 10:42:03 +08:00
ibuler a43d6ad34d feat: 资产添加admin_user_display 2020-06-04 20:26:42 +08:00
ibuler ca6825008b Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2020-06-04 20:00:48 +08:00
ibuler 9c6f118dbd feat: 添加批量命令的relation 2020-06-04 20:00:39 +08:00
Bai 5730e60089 [Update] 修改用户profile序列类 2020-06-04 17:24:31 +08:00
Bai afc7f3bb9c [Update] 修改用户public_key生成密钥的view 2020-06-04 17:05:36 +08:00
Bai c411b0a38e Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev 2020-06-04 17:02:52 +08:00
Bai 403b6fc563 [Update] 修改用户更新Public_key的条件判断 2020-06-04 17:02:43 +08:00
xinwen 55ae8bb5e6
[Fix] 系统设置/邮件设置/测试链接失败 (#4081) 2020-06-04 16:47:43 +08:00
Eric_Lee dbcf785e42
add flower view (#4078) 2020-06-04 15:10:02 +08:00
ibuler e6cd126045 feat: 修改api的权限 2020-06-04 14:55:33 +08:00
Bai 420f3c0c4c [Update] 添加celery task log view 2020-06-04 14:30:44 +08:00
Bai 9b2c5cb305 [Update] 修改用户profile序列类3 2020-06-03 21:00:37 +08:00
Bai 907f0068db [Update] 修改用户profile序列类2 2020-06-03 20:21:28 +08:00
Bai a16b3260ba Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev 2020-06-03 18:20:43 +08:00
Bai 1845821f6c [Update] 修改用户profile序列类 2020-06-03 18:20:33 +08:00
ibuler 27d906a877 feat: 去掉js i18n catalog 2020-06-03 16:26:10 +08:00
xinwen 431ba36a26
[Fix] 会话管理/命令记录 时间过滤 bug (#4070) 2020-06-03 15:05:55 +08:00
Eric_Lee 229c782157
change PAGE_SIZE_CHOICE to string value (#4069) 2020-06-03 14:06:44 +08:00
ibuler 5bacab7475 fix: 重置密钥到auth中 2020-06-03 12:44:45 +08:00
ibuler 999286a089 fix: 修复用户公钥错误引起的profile bug 2020-06-03 12:32:52 +08:00
ibuler 68ccaf0cb3 feat: 去掉第一次登录的那个导航 2020-06-03 12:26:53 +08:00
ibuler 8d58d58519 feat: 修改profile view 2020-06-03 11:58:16 +08:00
ibuler 8efc0331de feat: 删掉所有view, templates, forms 2020-06-03 11:43:43 +08:00
ibuler 7c479c2479 feat: 修改docs的url 2020-06-03 11:17:00 +08:00
ibuler 96551856a2 [Update] 部分view放到auth中 2020-06-03 11:06:44 +08:00
ibuler b1f5cc7728 [Update] 禁用view 2020-06-03 10:38:44 +08:00
ibuler 1a84661ca9 feat: 修改filterset_fields => filter_fields，option方法不支持filterset 2020-06-02 20:02:22 +08:00
ibuler 50bea55732 merge: with dev 2020-06-02 15:43:42 +08:00
ibuler a4ece2b271 feat: audits中添加id字段 2020-06-02 15:41:27 +08:00
xinwen b460e4abaa
[Fix] 日志审计 日期过滤与排序bug (#4063) 2020-06-02 15:40:07 +08:00
BaiJiangJie 087ba9ae95
Merge pull request #4059 from jumpserver/lina 
Lina
 2020-06-01 14:05:22 +08:00
Bai 9850633350 [Update] 添加LDAP USER_QUERY_FIELD字段值为username，解决数据库因大小敏感导致LDAP用户认证首次成功，再次失败的问题；如果不配置此字段，则查询使用小写，创建可能会使用大写，最终导致username重复而创建用户失败； 2020-06-01 12:06:39 +08:00
ibuler 5f2345852d Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-06-01 11:41:55 +08:00
ibuler ad1c17aa7b feat: 仅支持fields_size=mini,small 2020-06-01 10:10:28 +08:00
xinwen 3a79bfd5f6
[Update] 添加一些 i18n (#4052) 2020-05-29 15:18:25 +08:00
Bai 5ee8519274 [Update] 修改AccessKey序列类 2020-05-29 14:04:50 +08:00
Bai ff546774e9 Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina 2020-05-28 20:46:30 +08:00
Bai 1f4fc9b6f0 [Update] 修改API-Key序列类 2020-05-28 20:46:17 +08:00
xinwen f8142e23cd
[Fix] 权限管理-> 资产与数据库 Bug (#4049) 2020-05-28 19:08:48 +08:00
Bai 196f1654ab Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina 2020-05-28 17:47:27 +08:00
Bai 3b8a24eeb7 [Update] 添加用户profile public-key序列类 2020-05-28 17:47:18 +08:00
xinwen 7dde15cb04
[Feature] 权限管理-> 远程应用 添加 api (#4040) 
* [Feature] 权限管理-> 远程应用 添加 api

* [Feature] 添加 RelationMixin
 2020-05-28 17:00:42 +08:00
Bai 3e5d949610 [Update] 添加用户profile password序列类 2020-05-28 16:10:28 +08:00
Bai 25c3691f6b Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina 2020-05-28 15:03:07 +08:00
Bai f3bc6c0b22 [Update] 修改用户profile序列类 2020-05-28 15:02:53 +08:00
ibuler caf0d85939 [feat] 修改remote app, database app的过滤参数 2020-05-28 14:47:30 +08:00
ibuler a463f632e8 [Update] 优化重定向 2020-05-27 20:33:09 +08:00
ibuler a0e6d09770 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-05-27 19:51:45 +08:00
Bai 7afff5e392 [Update] merge from dev to lina 2020-05-27 18:44:12 +08:00
ibuler 9a5fee5a4c Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-05-27 18:03:14 +08:00
ibuler a840e611cd [Update] 修改core 的base url 2020-05-27 18:02:18 +08:00
Bai 566419cac4 Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina 2020-05-27 17:27:38 +08:00
Bai 7b362bfc76 [Update] 用户序列类添加mfa相关字段 2020-05-27 17:27:28 +08:00
ibuler f528dd4888 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-05-26 19:00:00 +08:00
ibuler 3c95c6fe11 [Feat] 添加失效用户权限的api 2020-05-26 18:56:03 +08:00
老广 71a72dd957
Merge pull request #4033 from jumpserver/update-i18n 
[Update] i18n
 2020-05-25 01:53:02 -05:00
xinwen 93453cc8c3 [Update] perms.serializers.asset_permission.AssetPermissionSerializer 添加字段 2020-05-25 14:50:07 +08:00
xinwen 11527b9033 [Update] i18n 2020-05-22 18:18:40 +08:00
ibuler 2ff2266417 [Update] 修改 SerializerMixin 还原之前的更改 2020-05-21 20:35:44 +08:00
ibuler 3320e6105c [Update] 删掉没用的内容 2020-05-21 19:00:47 +08:00
xinwen 492b1c4311 [Update] org retrieve api 2020-05-21 16:09:42 +08:00
xinwen 7b0993959e [Update] orgs.serializers.OrgReadSerializer add `id` 2020-05-21 15:40:41 +08:00
ibuler 701582fe38 [Update] 修改license的判断方法 2020-05-21 14:47:00 +08:00
ibuler b371676813 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-05-20 19:35:48 +08:00
Bai 2e0eab9289 [Update] 修改翻译信息 2020-05-20 19:35:35 +08:00
ibuler 0cac8d66b3 [Update] 修改index api 2020-05-20 19:35:33 +08:00
Bai 7c44f74068 [Bugfix] 修复只显示当前节点下资产不生效的问题 2020-05-20 18:20:01 +08:00
xinwen 245d28b03d [Update] 一些本地化 2020-05-20 17:45:50 +08:00
Bai 75f4f6d0a2 [Update] 资产授权序列类is_expired, is_valid设置为read_only 2020-05-19 20:50:33 +08:00
Bai f9e167cb0e Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina 2020-05-19 20:36:41 +08:00
Bai f224e49de7 [Update] 去掉资产授权序列类中不存在的字段 2020-05-19 20:36:17 +08:00
Bai 63ff868553 [Update] 授权资产树返回org_id字段值 2020-05-19 19:36:19 +08:00
Bai b97deec1de [Update] openid 继续使用配置项 base_site_url 2020-05-19 18:24:26 +08:00
Bai be3fdac8a9 [Update] 修复API-key不能删除的问题 2020-05-19 15:28:31 +08:00
Bai 96afd82341 [Update] 修复任务列表，执行历史中stat汇总数据显示问题 2020-05-19 15:15:17 +08:00
Bai 728e4b7edd [Update] 修复授权模块的信号处理监听不到的问题 2020-05-19 11:47:49 +08:00
Bai 73c3de97b8 [Update] 取消用户资产页面中，资产详情系统用户值为undefine的问题 2020-05-18 18:14:19 +08:00
Bai e98626988b [Update] 解决开启OpenID，为用户强制启用MFA导致，登录时报错的问题 2020-05-18 18:02:37 +08:00
Bai 01a52812f0 [Update] 修改用户MFA禁用/更新的View 2020-05-18 15:49:53 +08:00
Bai 041d99f0be [Update] 更新remote-app用户/用户组时自动刷新页面 2020-05-18 15:40:54 +08:00
Bai 75edc26a10 [Update] 修改翻译，禁用资产提示不支持ansible的错误提示 2020-05-18 15:25:24 +08:00
Bai 2f7b169405 [Update] 修改授权用户/用户组页面删除用户组失败的问题 2020-05-18 15:24:55 +08:00
ibuler 76ef9b292b [Update] 修改public api 2020-05-18 14:55:16 +08:00
ibuler 1540cbdcaa [Update] 修改csv render 2020-05-18 11:52:50 +08:00
Bai e951b64b0a [Update] 修改版本号1.5.9 2020-05-14 16:14:17 +08:00
ibuler 5d129fd0da Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-05-14 14:51:05 +08:00
ibuler b529127461 [Update] 修改user role 2020-05-14 14:49:54 +08:00
Bai d878089ebd [Update] 用户资产详情Modal添加comment 2020-05-14 14:26:00 +08:00
Bai 4658a4c90f [Update] 修改向导文案 2020-05-14 11:00:24 +08:00
Bai d06ea2944e [Update] 修改Dashboard API 2020-05-14 10:53:30 +08:00
ibuler 154aad1e22 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-05-13 11:06:24 +08:00
ibuler 17163dd909 [Update] 用户Profile添加在当前组织的角色 2020-05-13 11:05:58 +08:00
Bai 9341ce9f84 [Update] 修复AssetUserViewSet 使用Option方法时error 2020-05-12 20:31:32 +08:00
ibuler 195cbbbe42 [Update] 修改profile serialzier 2020-05-12 17:57:35 +08:00
xinwen eb74d13059 [Update] Asset filter 添加 platform__base 字段 2020-05-12 17:24:51 +08:00
xinwen 4dd6d4498b [Update] Asset filter 添加 platform__name 字段 2020-05-12 17:09:36 +08:00
ibuler dd5bf546df [Update] 修改serialzier_class 2020-05-12 15:37:37 +08:00
ibuler d6debde566 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-05-11 19:28:24 +08:00
ibuler efc66cc7ee [Update] 默认关闭debug 2020-05-11 19:28:02 +08:00
Bai 4bd2681bf0 [Update] Merge from dev to lina 2020-05-11 17:43:48 +08:00
Bai 98e3adbb11 [Update] Merge from master to dev 2020-05-11 17:38:01 +08:00
Bai 7b3647e78a [Bugfix] 修复用户页面更新MFA时解除管理员强制启用的Bug 2020-05-11 16:56:52 +08:00
Bai 0a8eeca629 [Update] 仪表盘缓存key添加组织id 2020-05-11 15:12:42 +08:00
Bai 0cff6ab29b [Update] Merge fromo dev to lina 2020-05-11 14:03:24 +08:00
ibuler cda677a30f [update] 修改remote apps的serializer 2020-05-11 12:35:33 +08:00
ibuler 2680396680 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-05-09 16:08:32 +08:00
ibuler 227f97c2f5 [Update] 修改remote apps 字段 2020-05-09 16:08:09 +08:00
老广 ad3231c8a3
Merge pull request #3982 from jumpserver/update-ops-migrate 
[Update] 重建 ops 0018 迁移脚本
 2020-05-09 01:54:37 -05:00
ibuler e39d8dce3c [Update] 修改fields 2020-05-09 14:52:44 +08:00
ibuler 0bdc425c55 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-05-09 14:51:47 +08:00
ibuler 0a7f63cc5e [Update] 修改remote app api 2020-05-09 14:51:19 +08:00
xinwen c6e0e9a79a [Update] 重建 ops 0018 迁移脚本 2020-05-09 14:50:22 +08:00
BaiJiangJie 4cebfc7f6a
[Update] 修改翻译 (#3981) 
* [Update] 修改翻译

* [Update] 修改翻译2
 2020-05-09 13:29:39 +08:00
xinwen 3ee051303a [Update] audits 模块为一些 models 字段添加 verbose 信息 2020-05-09 11:29:25 +08:00
老广 9fa31be4bf
Merge pull request #3976 from jumpserver/add-audits-apis 
[Add] audits apis
 2020-05-08 08:04:14 -05:00
Eric 48b71bb11b AUTH_LDAP_USER_ATTR_MAP to Dict field 2020-05-08 20:58:13 +08:00
Bai 11b3c57c92 [Update] 修改dashboard中使用的变量名 2020-05-08 20:02:00 +08:00
xinwen e339ed1fb3 [Add] audits apis 2020-05-08 17:59:58 +08:00
Bai 185c53d311 [Update] Merge from master to dev 2020-05-08 16:40:07 +08:00
BaiJiangJie 2f030c02ec
Merge pull request #3973 from jumpserver/master_org 
[Update] 优化仪表盘、组织详情页
 2020-05-08 16:27:49 +08:00
ibuler c6ed6d8acb [Update] 去掉debug信息 2020-05-08 15:58:00 +08:00
ibuler 331cfe2aed [Bugfix] 修复节点数量缓存显示不对的bug 2020-05-08 15:53:58 +08:00
Bai e48dbabef2 [Update] 修改翻译 2020-05-08 15:50:01 +08:00
Bai 181973f235 [Update] 优化仪表盘页面加载 2020-05-08 15:41:56 +08:00
ibuler 1936a6d5ee [Update] 去掉perms cache enable settings 2020-05-08 14:25:28 +08:00
ibuler 44a2a51f59 Merge branch 'PERM_CACHE_CONFIG' into dev 2020-05-08 13:13:47 +08:00
ibuler 2d4498578a [Update] 修改授权缓存配置的默认值 2020-05-08 13:13:38 +08:00
xinwen ac902501ec [Add] ftp-logs api 2020-05-08 12:46:18 +08:00
xinwen dec89ae5ee [Update] login-logs api 添加 `mfa_display` 2020-05-08 10:08:57 +08:00
Eric 9a39ccd37d [Update] Reponse status code from 401 to 400 2020-05-07 16:57:57 +08:00
ibuler 8c0bf0b71b [Update] Login log 添加display field 2020-05-06 19:35:19 +08:00
Eric 7b339df430 [Update] save settings 2020-05-06 16:36:36 +08:00
Bai aec78dc3c7 [Update] 添加组织详情->组织用户tab页，解决组织详情页面加载超时问题 2020-05-06 15:31:08 +08:00
ibuler 6bb13a26f5 [Update] 修改用户serializer 2020-04-30 16:58:08 +08:00
ibuler b92137afd9 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-04-30 16:53:21 +08:00
老广 962763dc7b
Merge pull request #3954 from xuxinwen/feature-audits-apis 
[Feature] 添加 login-logs API
 2020-04-30 03:52:57 -05:00
xuxinwen f4eca83a49 [feature] 添加 login-logs API 2020-04-30 16:40:55 +08:00
Eric 79eb838250 [Update] setting fields automatically generated by serializer 2020-04-29 18:10:42 +08:00
Eric 82710294f4 Merge branch 'lina' of https://github.com/jumpserver/jumpserver into settings_api 2020-04-29 17:09:50 +08:00
Eric 2d18acf6f7 [Update] settings api 2020-04-29 17:04:58 +08:00
ibuler f8c323cf5c [Update] 优化user group serializer 2020-04-29 16:01:14 +08:00
ibuler b6f5b335bd Merge branch 'api_perf' into lina 2020-04-29 15:47:46 +08:00
Eric f451f8a979 Merge branch 'lina' of https://github.com/jumpserver/jumpserver into settings_api 2020-04-29 14:33:22 +08:00
ibuler 5c4dfabc48 [Update] 修改settings 2020-04-29 14:32:51 +08:00
Bai 6eaba4e2fb [Update] openid配置分块 2020-04-29 14:03:48 +08:00
ibuler 0c0c0e6d6f Merge branch 'dev' into lina 2020-04-29 13:00:47 +08:00
Eric 20cf7c7c52 [Update] Add settings api 2020-04-29 11:09:35 +08:00
ibuler 230d6137f3 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-04-29 10:21:06 +08:00
ibuler aa9533eb5b [Update] Groups users字段可以显示 2020-04-29 10:19:25 +08:00
Bai 23f9454e5d [Update] 修改Url name (oidc => openi) 2020-04-29 01:12:00 +08:00
Bai 9eee79f7d4 [Update] 调整openid backend顺序；openid 用户创建/更新添加日志输出 2020-04-29 00:43:54 +08:00
Bai c0089a98f4 [Update] 修改openid信号名称 2020-04-28 22:29:56 +08:00
Bai 87242c13a1 [Update] 修改信号监听kwargs 2020-04-28 21:06:13 +08:00
Bai 184432a2a6 [Update] 更新OpenID的配置项以及对应的信号监听 2020-04-28 21:00:22 +08:00
Bai a505995f49 [Update] 修改config_example(openid) 2020-04-27 11:36:11 +08:00
BaiJiangJie 7833ff6671
Dev oidc (#3941) 
* [Update] oidc_rp获取token添加headers base64编码

* [Update] 移除对oidc_rp的支持

* [Update] 移除对oidc_rp的支持2

* [Update] 修改OpenID配置（添加新配置项，并对旧配置项做兼容）

* [Update] 移除所有与Keycloak相关的模块

* [Update] 添加jumpserver-django-oidc-rp的使用

* [Update] 更新登录重定向地址(oidc)

* [Update] oidc添加一些配置参数；处理用户登录/创建/更新等信号

* [Update] 修改退出登录逻辑

* [Update] 添加oidc user登录成功的信号机制

* [Update] 修改mfa认证choices内容 (otp => code)

* [Update] 添加OpenID backend password 认证失败信号机制；修改引入common包问题

* [Update] 用户Token/Auth API 校验用户时，传入request参数（解决登录成功日志记录的问题）

* [Update] 添加依赖jumpserver-django-oidc-rp==0.3.7.1

* [Update] oidc认证模块说明
 2020-04-26 20:36:17 +08:00
Bai fc5ec3f21c [Update] 更新仪表盘数据显示问题 2020-04-24 11:29:01 +08:00
ibuler efb5d4135a [Update] 优化api字段显示 2020-04-23 11:14:02 +08:00
ibuler 5f2c9c3801 [Update] 添加 authentication backend header 2020-04-22 15:13:04 +08:00
Bai 586c04cba6 [Update] 添加oidc-op配置信息 2020-04-22 11:09:13 +08:00
BaiJiangJie 272701a8fd
Dev oidc (#3930) 
* [Update] 添加django-oidc-rp支持

* [Update] 添加django-oidc-rp支持2

* [Update] 调试django-oidc-rp对keycloak的支持

* [Update] 调试django-oidc-rp对keycloak的支持2

* [Update] 修改oidc_rp创建用户/更新用户的功能

* [Update] oidc_rp添加支持password认证

* [Update] 重写oidc_rp end session view

* [Update] 优化 oidc_rp view backend url 等引用关系
 2020-04-22 00:22:24 +08:00
Eric c8c6ba1c19 [Update] add terminal model fileds 2020-04-21 17:37:29 +08:00
老广 2df7bd8510
Merge pull request #3926 from jumpserver/fix_otp_error 
Fix otp error
 2020-04-20 17:00:54 +08:00
ibuler 44db0e8a5d [Bugfix] 修复查询授权时额外查询platform的问题 2020-04-20 16:56:47 +08:00
ibuler 91c994924f [Update] 修改报错文案 2020-04-20 10:44:45 +08:00
ibuler 61407331bc [Bugfix] 修复otp登录时导致的500 2020-04-20 10:37:07 +08:00
BaiJiangJie 1b1a686b96
Merge pull request #3922 from jumpserver/dev 
Dev
 2020-04-18 23:19:11 +08:00
BaiJiangJie 0379e5160c
[Bugfix] 修复真实组织下，新建的用户角色显示不稳定的问题2 (#3919) 
* [Bugfix] 修复真实组织下，新建的用户角色显示不稳定的问题2

* [Bugfix] 修复真实组织下，新建的用户角色显示不稳定的问题3

* [Bugfix] 修复真实组织下，新建的用户角色显示不稳定的问题4
 2020-04-18 23:14:25 +08:00
BaiJiangJie 386ce629ac
Merge pull request #3918 from jumpserver/fix_connectivity 
[Update] 修复资产页面可连接性
 2020-04-18 10:42:55 +08:00
Bai b4cc2bbff9 [Bugfix] 修复真实组织下，新建的用户角色显示不稳定的问题 2020-04-18 01:22:48 +08:00
BaiJiangJie e74289b223
[Update] 修改用户密码重置页面错误信息提示2 (#3914) 2020-04-17 23:41:50 +08:00
ibuler 98afa032a7 [Update] 修复资产页面可连接性 2020-04-17 16:32:38 +08:00
Bai 081f4b1c0a [Update] 修改用户密码重置页面错误信息提示 2020-04-17 11:26:29 +08:00
BaiJiangJie e9fe5b3004
Merge pull request #3908 from jumpserver/dev 
Dev
 2020-04-16 18:30:54 +08:00
Bai 6890d549ed [Update] 修改忘记密码页面的错误信息提示 2020-04-16 18:29:02 +08:00
ibuler 6a2a0013a8 [Update] 去掉debug 2020-04-16 12:12:24 +08:00
ibuler 864a4c0485 [Bugfix] 修复显示未授权资产的bug 2020-04-16 12:08:52 +08:00
ibuler 3648a1458b [Update] 修改command options get view filter 2020-04-16 11:27:46 +08:00
BaiJiangJie 5001f48982
Merge pull request #3899 from jumpserver/dev 
Dev
 2020-04-14 19:46:36 +08:00
Bai 83eb8f77d1 [Update] 修改测试邮件后，配置获取不稳定的Bug（显示给settings赋值导致） 2020-04-14 19:40:56 +08:00
BaiJiangJie 4eaaa2462b
Merge pull request #3897 from jumpserver/dev 
Dev
 2020-04-14 17:53:52 +08:00
Bai 77149bf36c [Update] 修改监控多个会话时，总是覆盖同一个tab页 2020-04-14 17:50:47 +08:00
Bai 6337d0d0a1 [Update] 修改会话can_join为property 2020-04-14 16:12:24 +08:00
BaiJiangJie 8fd5e6521f
Merge pull request #3892 from jumpserver/dev_bai 
Dev bai
 2020-04-14 13:20:50 +08:00
Bai 55fa5800b1 [Update] 修复系统设置-终端设置-资产排序设置不生效的Bug 2020-04-14 13:18:33 +08:00
BaiJiangJie 6cdba2e8d2
Merge pull request #3890 from jumpserver/dev_bai 
Dev bai
 2020-04-14 12:56:20 +08:00
Bai 63519ec076 [Update] 修改命令记录/操作/改密日志搜索字段没清空的问题 2020-04-14 12:51:13 +08:00
Bai 48fa26a3bc [Update] 修改操作日志搜索字段没清空的问题 2020-04-14 11:03:12 +08:00
Bai d969563e43 [Update] 修复自定义平台列表在详情页删除失败的bug 2020-04-14 10:42:40 +08:00
Bai 4fb4a9f622 [Update] 更新翻译 2020-04-13 19:21:53 +08:00
BaiJiangJie 4dcd4749c3
Merge pull request #3884 from jumpserver/dev 
Dev
 2020-04-13 18:24:54 +08:00
BaiJiangJie 508d1c2c1f
Merge pull request #3883 from jumpserver/master_bai 
Master bai
 2020-04-13 18:23:43 +08:00
Bai 41cbd3e0f6 [Update] 修改OpenID用户获取username的问题 2020-04-13 18:21:49 +08:00
Bai d5e1ca7908 [Update] 添加翻译 2020-04-13 14:19:42 +08:00
Bai 06fb502a1d [Update] 修改文案: 加入 -> 监控 2020-04-13 14:17:08 +08:00
Bai 3f6d7637c3 [Update] 更新用户添加CAS来源选项 2020-04-13 13:40:13 +08:00
ibuler 0d2b4d7ca3 [Update] 添加ids filter 2020-04-13 10:40:13 +08:00
Bai d1d73da322 [Update] Merge from dev 2020-04-10 14:46:35 +08:00
Bai 396bc9b6ae [Update] 修改用户ViewSet序列类返回的admin_orgs（解决组织管理员登录的Bug) 2020-04-10 12:47:16 +08:00
BaiJiangJie 27ffed1be9
Merge pull request #3868 from jumpserver/dev_user 
[Update] 修改用户ViewSet序列类返回的admin_orgs（解决组织管理员登录的Bug)
 2020-04-10 12:40:12 +08:00
Bai af9d42695f [Update] 修改用户ViewSet序列类返回的admin_orgs（解决组织管理员登录的Bug) 2020-04-10 12:38:05 +08:00
Michael Bai dc172e1ef0 [Update] 修复AuthBook删除失败的Bug 2020-04-09 23:39:17 +08:00
ibuler cd7946f3f0 [Update] 修改一些bug 2020-04-09 18:58:22 +08:00
BaiJiangJie 4994a4a387
Dev bai (#3865) 
* [Update] 更新config-example（CAS)

* [Update] 更新config-example（CAS)2

* [Update] 更新config-example（CAS)3
 2020-04-09 13:39:11 +08:00
Bai 44cd82f3e1 [Update] 修改翻译 2020-04-09 10:59:00 +08:00
Bai adf14b0f2e [Update] 修改版本号 2020-04-09 10:46:24 +08:00
Bai f5a7c4131d [Update] 修改校验join session的url-name 2020-04-09 10:43:25 +08:00
ibuler e7031d0ac1 [Update] 修改serailizer mixin 2020-04-09 10:33:20 +08:00
Bai ef27188f86 [Update] 修改Bug: CommandViewSet的Option方法Error 2020-04-08 18:08:22 +08:00
Michael Bai fb62fbde6c [Update] 命令记录导出: 只导出满足搜索条件的数据 2020-04-08 01:34:10 +08:00
BaiJiangJie 521f4ea86b
Merge pull request #3857 from jumpserver/1.5.8_bai 
1.5.8 bai
 2020-04-07 12:32:54 +08:00
Bai e9827c8b25 [Update] 添加会话加入校验API 2020-04-07 12:26:47 +08:00
Bai 29b099efc0 [Update] 添加加入会话按钮 2020-04-02 19:45:56 +08:00
Bai e9fc56c056 [Update] 修改日志日期显示问题 2020-04-02 16:02:55 +08:00
Bai e9103ee608 [Update] 对自定义MetaDict字段值进行strip 2020-04-02 15:14:30 +08:00
ibuler f8dae2a3c9 [Update] 时区允许设置 2020-04-01 17:27:32 +08:00
BaiJiangJie 7977294c5c
Merge pull request #3841 from jumpserver/dev 
Dev
 2020-03-28 21:36:09 +08:00
Michael Bai 5268c0faae [Update] OpenID登录成功后，如果用户没有email字段则构造默认的email 2020-03-28 21:34:17 +08:00
Bai 5087c0e06f Merge branch 'dev' into 1.5.8_cap 2020-03-27 11:26:09 +08:00
Bai 4583beaec0 [Update] 创建AuthBook对象的方法从ModelManager中移动到Model中，保留原生的对象create方法；同时添加事务处理； 2020-03-26 13:11:38 +08:00
Bai 4503df910d [Update] 优化创建AuthBook逻辑；添加锁机制(基于redis-lock)； 2020-03-24 18:40:20 +08:00
Michael Bai 55c7e06185 [Update] 修改任务执行日期显示本地时间 2020-03-24 01:37:09 +08:00
ibuler 0fd43f48f0 [Bugfix] 修复因数据不支持timezone引起的仪表盘数据为空的bug 2020-03-23 17:55:28 +08:00
ibuler dffd05cd20 [Update] 修改组织获取优先级 2020-03-23 10:52:26 +08:00
Michael Bai 89f62d8e6b [Update] 更新翻译 2020-03-23 03:06:53 +08:00
Michael Bai 41b73c3701 [Update] 修改提示播放器下载地址 2020-03-23 03:02:22 +08:00
Michael Bai 8328edd69c [Update] 修改Node generate fake时死循环的问题 2020-03-23 02:32:24 +08:00
ibuler 9bf5d6dd45 [Update] 用户profile中添加orgs 2020-03-20 18:21:27 +08:00
ibuler 064cb16d25 [Update] 禁用ansible连接复用 2020-03-20 16:45:38 +08:00
ibuler b25096925b [Bugfix] 修复重置并下载ssh key的bug 2020-03-19 16:28:08 +08:00
ibuler 5ac1467564 [Update] 修复收藏数量不对的问题 2020-03-19 15:41:41 +08:00