Commit Graph

  • 9362c272cb Merge branch 'dev' of github.com:jumpserver/jumpserver into dev ibuler 2020-06-09 10:19:07 +08:00
  • ee4534ac4b feat: public setting添加key ibuler 2020-06-09 10:17:16 +08:00
  • 7ef09a4ca1 [Update] UserSerializer 添加 login_confirm_settings (#4086) xinwen 2020-06-08 17:16:30 +08:00
  • 31daaed4cd feat: 添加auth confirm 到public setting ibuler 2020-06-08 16:48:10 +08:00
  • 71202e83f5 feat: 修改用户的api ibuler 2020-06-05 20:15:23 +08:00
  • b1640e5592 fix: 修改common resource api的权限,否则auditor无法使用 ibuler 2020-06-05 14:43:40 +08:00
  • 076b7babcb 修改批量命令的api ibuler 2020-06-05 14:20:34 +08:00
  • 8569910658 feat: command exexution audit log的搜索 ibuler 2020-06-05 14:07:23 +08:00
  • 34c556d375 [Fix] spm (#4082) xinwen 2020-06-05 10:42:03 +08:00
  • a43d6ad34d feat: 资产添加admin_user_display ibuler 2020-06-04 20:26:42 +08:00
  • ca6825008b Merge branch 'dev' of github.com:jumpserver/jumpserver into dev ibuler 2020-06-04 20:00:48 +08:00
  • 9c6f118dbd feat: 添加批量命令的relation ibuler 2020-06-04 20:00:39 +08:00
  • 5730e60089 [Update] 修改用户profile序列类 Bai 2020-06-04 17:24:31 +08:00
  • afc7f3bb9c [Update] 修改用户public_key生成密钥的view Bai 2020-06-04 17:05:36 +08:00
  • c411b0a38e Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev Bai 2020-06-04 17:02:52 +08:00
  • 403b6fc563 [Update] 修改用户更新Public_key的条件判断 Bai 2020-06-04 17:02:43 +08:00
  • 55ae8bb5e6 [Fix] 系统设置/邮件设置/测试链接失败 (#4081) xinwen 2020-06-04 16:47:43 +08:00
  • dbcf785e42 add flower view (#4078) Eric_Lee 2020-06-04 15:10:02 +08:00
  • e6cd126045 feat: 修改api的权限 ibuler 2020-06-04 14:55:33 +08:00
  • 420f3c0c4c [Update] 添加celery task log view Bai 2020-06-04 14:30:44 +08:00
  • 9b2c5cb305 [Update] 修改用户profile序列类3 Bai 2020-06-03 21:00:37 +08:00
  • 907f0068db [Update] 修改用户profile序列类2 Bai 2020-06-03 20:21:28 +08:00
  • a16b3260ba Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev Bai 2020-06-03 18:20:43 +08:00
  • 1845821f6c [Update] 修改用户profile序列类 Bai 2020-06-03 18:20:33 +08:00
  • 27d906a877 feat: 去掉js i18n catalog ibuler 2020-06-03 16:26:10 +08:00
  • 431ba36a26 [Fix] 会话管理/命令记录 时间过滤 bug (#4070) xinwen 2020-06-03 15:05:55 +08:00
  • 229c782157 change PAGE_SIZE_CHOICE to string value (#4069) Eric_Lee 2020-06-03 14:06:44 +08:00
  • 5bacab7475 fix: 重置密钥到auth中 ibuler 2020-06-03 12:44:45 +08:00
  • 999286a089 fix: 修复用户公钥错误引起的profile bug ibuler 2020-06-03 12:32:52 +08:00
  • 68ccaf0cb3 feat: 去掉第一次登录的那个导航 ibuler 2020-06-03 12:26:53 +08:00
  • 8d58d58519 feat: 修改profile view ibuler 2020-06-03 11:58:16 +08:00
  • 8efc0331de feat: 删掉所有view, templates, forms ibuler 2020-06-03 11:43:43 +08:00
  • 7c479c2479 feat: 修改docs的url ibuler 2020-06-03 11:17:00 +08:00
  • 96551856a2 [Update] 部分view放到auth中 ibuler 2020-06-03 11:06:44 +08:00
  • b1f5cc7728 [Update] 禁用view ibuler 2020-06-03 10:38:44 +08:00
  • 1a84661ca9 feat: 修改filterset_fields => filter_fields,option方法不支持filterset ibuler 2020-06-02 20:02:22 +08:00
  • c87b9f203f feat: 修改依赖库版本 ibuler 2020-06-02 15:51:24 +08:00
  • 9442acfb74 Celery version (#4064) 老广 2020-06-02 02:44:45 -05:00
  • 50bea55732 merge: with dev ibuler 2020-06-02 15:43:42 +08:00
  • a4ece2b271 feat: audits中添加id字段 ibuler 2020-06-02 15:41:27 +08:00
  • b460e4abaa [Fix] 日志审计 日期过滤与排序bug (#4063) xinwen 2020-06-02 15:40:07 +08:00
  • 087ba9ae95 Merge pull request #4059 from jumpserver/lina BaiJiangJie 2020-06-01 14:05:22 +08:00
  • 19926e67e1 Merge pull request #4058 from jumpserver/dev BaiJiangJie 2020-06-01 14:02:56 +08:00
  • af15622319 Merge pull request #4057 from jumpserver/dev_ldap BaiJiangJie 2020-06-01 12:51:30 +08:00
  • 9850633350 [Update] 添加LDAP USER_QUERY_FIELD字段值为username,解决数据库因大小敏感导致LDAP用户认证首次成功,再次失败的问题;如果不配置此字段,则查询使用小写,创建可能会使用大写,最终导致username重复而创建用户失败; Bai 2020-06-01 12:06:39 +08:00
  • 5f2345852d Merge branch 'lina' of github.com:jumpserver/jumpserver into lina ibuler 2020-06-01 11:41:55 +08:00
  • ad1c17aa7b feat: 仅支持fields_size=mini,small ibuler 2020-06-01 10:10:28 +08:00
  • 3a79bfd5f6 [Update] 添加一些 i18n (#4052) xinwen 2020-05-29 15:18:25 +08:00
  • 5ee8519274 [Update] 修改AccessKey序列类 Bai 2020-05-29 14:04:50 +08:00
  • ff546774e9 Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina Bai 2020-05-28 20:46:30 +08:00
  • 1f4fc9b6f0 [Update] 修改API-Key序列类 Bai 2020-05-28 20:46:17 +08:00
  • f8142e23cd [Fix] 权限管理-> 资产与数据库 Bug (#4049) xinwen 2020-05-28 19:08:48 +08:00
  • 196f1654ab Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina Bai 2020-05-28 17:47:27 +08:00
  • 3b8a24eeb7 [Update] 添加用户profile public-key序列类 Bai 2020-05-28 17:47:18 +08:00
  • 7dde15cb04 [Feature] 权限管理-> 远程应用 添加 api (#4040) xinwen 2020-05-28 17:00:42 +08:00
  • 3e5d949610 [Update] 添加用户profile password序列类 Bai 2020-05-28 16:10:28 +08:00
  • 25c3691f6b Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina Bai 2020-05-28 15:03:07 +08:00
  • f3bc6c0b22 [Update] 修改用户profile序列类 Bai 2020-05-28 15:02:53 +08:00
  • caf0d85939 [feat] 修改remote app, database app的过滤参数 ibuler 2020-05-28 14:47:30 +08:00
  • a463f632e8 [Update] 优化重定向 ibuler 2020-05-27 20:33:09 +08:00
  • a0e6d09770 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina ibuler 2020-05-27 19:51:45 +08:00
  • 54623a5b06 Merge pull request #4047 from jumpserver/lina_dev BaiJiangJie 2020-05-27 18:46:48 +08:00
  • 7afff5e392 [Update] merge from dev to lina Bai 2020-05-27 18:44:12 +08:00
  • 9a5fee5a4c Merge branch 'lina' of github.com:jumpserver/jumpserver into lina ibuler 2020-05-27 18:03:14 +08:00
  • a840e611cd [Update] 修改core 的base url ibuler 2020-05-27 18:02:18 +08:00
  • 566419cac4 Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina Bai 2020-05-27 17:27:38 +08:00
  • 7b362bfc76 [Update] 用户序列类添加mfa相关字段 Bai 2020-05-27 17:27:28 +08:00
  • f528dd4888 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina ibuler 2020-05-26 19:00:00 +08:00
  • 3c95c6fe11 [Feat] 添加失效用户权限的api ibuler 2020-05-26 18:56:03 +08:00
  • 0b17d55f30 Merge pull request #4041 from jumpserver/dev_oidc BaiJiangJie 2020-05-26 14:23:52 +08:00
  • 3861943518 [Update] 修改依赖版本号 jumpserver-django-oidc-rp==0.3.7.5 Bai 2020-05-26 14:23:04 +08:00
  • 71a72dd957 Merge pull request #4033 from jumpserver/update-i18n 老广 2020-05-25 01:53:02 -05:00
  • 78ac1968dd Merge pull request #4039 from jumpserver/asset_permission-add-field 老广 2020-05-25 01:52:35 -05:00
  • 93453cc8c3 [Update] perms.serializers.asset_permission.AssetPermissionSerializer 添加字段 xinwen 2020-05-25 14:50:07 +08:00
  • 11527b9033 [Update] i18n xinwen 2020-05-22 18:18:40 +08:00
  • 2ff2266417 [Update] 修改 SerializerMixin 还原之前的更改 ibuler 2020-05-21 20:35:44 +08:00
  • 1ef1bea703 Merge pull request #4029 from jumpserver/dev 老广 2020-05-21 07:06:49 -05:00
  • 6804f23b51 [Update] 修改readme ibuler 2020-05-21 20:01:53 +08:00
  • ea7e1f19b2 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev ibuler 2020-05-21 19:55:36 +08:00
  • 3320e6105c [Update] 删掉没用的内容 ibuler 2020-05-21 19:00:47 +08:00
  • 072e74ce49 Merge pull request #4027 from jumpserver/update-org-user 老广 2020-05-21 03:15:05 -05:00
  • 492b1c4311 [Update] org retrieve api xinwen 2020-05-21 16:09:42 +08:00
  • 0babada459 Merge pull request #4025 from jumpserver/update-org-user-add-id 老广 2020-05-21 02:43:35 -05:00
  • 7b0993959e [Update] orgs.serializers.OrgReadSerializer add id xinwen 2020-05-21 15:40:41 +08:00
  • 701582fe38 [Update] 修改license的判断方法 ibuler 2020-05-21 14:47:00 +08:00
  • d289960ff2 Merge pull request #3998 from jumpserver/dev BaiJiangJie 2020-05-21 14:00:37 +08:00
  • 6adf37a30d Merge pull request #4022 from jumpserver/dev_tran BaiJiangJie 2020-05-20 19:43:43 +08:00
  • b371676813 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina ibuler 2020-05-20 19:35:48 +08:00
  • 2e0eab9289 [Update] 修改翻译信息 Bai 2020-05-20 19:35:35 +08:00
  • 0cac8d66b3 [Update] 修改index api ibuler 2020-05-20 19:35:33 +08:00
  • 2053e9210e Merge pull request #4021 from jumpserver/dev_asset BaiJiangJie 2020-05-20 18:21:59 +08:00
  • 7c44f74068 [Bugfix] 修复只显示当前节点下资产不生效的问题 Bai 2020-05-20 18:20:01 +08:00
  • 3e0f5af848 Merge pull request #4019 from jumpserver/update-some-i18n 老广 2020-05-20 05:17:12 -05:00
  • 245d28b03d [Update] 一些本地化 xinwen 2020-05-20 17:45:50 +08:00
  • 75f4f6d0a2 [Update] 资产授权序列类is_expired, is_valid设置为read_only Bai 2020-05-19 20:50:33 +08:00
  • f9e167cb0e Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina Bai 2020-05-19 20:36:41 +08:00
  • f224e49de7 [Update] 去掉资产授权序列类中不存在的字段 Bai 2020-05-19 20:36:17 +08:00
  • 4ec4869896 Merge pull request #4012 from jumpserver/dev_permsasset BaiJiangJie 2020-05-19 19:37:13 +08:00
  • 63ff868553 [Update] 授权资产树返回org_id字段值 Bai 2020-05-19 19:36:19 +08:00
  • 234130091b Merge pull request #4011 from jumpserver/dev_conf BaiJiangJie 2020-05-19 18:38:47 +08:00