Commit Graph

  • 7b339df430 [Update] save settings Eric 2020-05-06 16:36:36 +08:00
  • aec78dc3c7 [Update] 添加组织详情->组织用户tab页,解决组织详情页面加载超时问题 Bai 2020-05-06 15:31:08 +08:00
  • 6bb13a26f5 [Update] 修改用户serializer ibuler 2020-04-30 16:58:08 +08:00
  • b92137afd9 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina ibuler 2020-04-30 16:53:21 +08:00
  • 962763dc7b Merge pull request #3954 from xuxinwen/feature-audits-apis 老广 2020-04-30 03:52:57 -05:00
  • f4eca83a49 [feature] 添加 login-logs API xuxinwen 2020-04-29 19:05:56 +08:00
  • 02135ea04f Merge pull request #3948 from jumpserver/settings_api 老广 2020-04-29 18:25:10 +08:00
  • 79eb838250 [Update] setting fields automatically generated by serializer Eric 2020-04-29 18:10:42 +08:00
  • 82710294f4 Merge branch 'lina' of https://github.com/jumpserver/jumpserver into settings_api Eric 2020-04-29 17:09:50 +08:00
  • 2d18acf6f7 [Update] settings api Eric 2020-04-29 17:04:48 +08:00
  • a860bed34f [Update] 修改config_example配置(openid) (#3951) BaiJiangJie 2020-04-29 16:57:10 +08:00
  • f8c323cf5c [Update] 优化user group serializer ibuler 2020-04-29 16:01:14 +08:00
  • b6f5b335bd Merge branch 'api_perf' into lina ibuler 2020-04-29 15:47:46 +08:00
  • f451f8a979 Merge branch 'lina' of https://github.com/jumpserver/jumpserver into settings_api Eric 2020-04-29 14:33:22 +08:00
  • 5c4dfabc48 [Update] 修改settings ibuler 2020-04-29 14:32:51 +08:00
  • 72ccaf7b1c Merge pull request #3949 from jumpserver/dev_openid BaiJiangJie 2020-04-29 14:25:32 +08:00
  • e4b788a012 [Update] 修改依赖版本 jumpserver-dajngo-oidc-rp (0.3.7.2) Bai 2020-04-29 14:07:54 +08:00
  • 6eaba4e2fb [Update] openid配置分块 Bai 2020-04-29 14:03:48 +08:00
  • 0c0c0e6d6f Merge branch 'dev' into lina ibuler 2020-04-29 13:00:47 +08:00
  • 20cf7c7c52 [Update] Add settings api Eric 2020-04-29 11:08:09 +08:00
  • 230d6137f3 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina ibuler 2020-04-29 10:21:06 +08:00
  • aa9533eb5b [Update] Groups users字段可以显示 ibuler 2020-04-29 10:19:25 +08:00
  • 23f9454e5d [Update] 修改Url name (oidc => openi) Bai 2020-04-29 01:12:00 +08:00
  • 9eee79f7d4 [Update] 调整openid backend顺序;openid 用户创建/更新添加日志输出 Bai 2020-04-29 00:43:54 +08:00
  • c0089a98f4 [Update] 修改openid信号名称 Bai 2020-04-28 22:29:56 +08:00
  • 87242c13a1 [Update] 修改信号监听kwargs Bai 2020-04-28 21:06:13 +08:00
  • 184432a2a6 [Update] 更新OpenID的配置项以及对应的信号监听 Bai 2020-04-28 21:00:22 +08:00
  • 555861c319 Merge pull request #3943 from jumpserver/dev_conf BaiJiangJie 2020-04-27 12:50:03 +08:00
  • a505995f49 [Update] 修改config_example(openid) Bai 2020-04-27 11:36:11 +08:00
  • b477b649f5 Merge pull request #3942 from jumpserver/dev_docker BaiJiangJie 2020-04-26 22:41:49 +08:00
  • 6e18383531 [Update] 修改Dockerfile pypi 镜像源(阿里=>清华) Michael Bai 2020-04-26 22:40:56 +08:00
  • 7833ff6671 Dev oidc (#3941) BaiJiangJie 2020-04-26 20:36:17 +08:00
  • 5d433456d4 Merge pull request #3937 from jumpserver/dev_index BaiJiangJie 2020-04-24 11:30:30 +08:00
  • fc5ec3f21c [Update] 更新仪表盘数据显示问题 Bai 2020-04-24 11:29:01 +08:00
  • efb5d4135a [Update] 优化api字段显示 ibuler 2020-04-23 11:14:02 +08:00
  • 5f2c9c3801 [Update] 添加 authentication backend header ibuler 2020-04-22 15:13:04 +08:00
  • 56f38e57bc Merge pull request #3932 from jumpserver/dev_oidc BaiJiangJie 2020-04-22 11:11:47 +08:00
  • 586c04cba6 [Update] 添加oidc-op配置信息 Bai 2020-04-22 11:09:13 +08:00
  • 306605915c [Update] 添加依赖 django-oidc-rp==0.3.4 Bai 2020-04-22 00:31:59 +08:00
  • 272701a8fd Dev oidc (#3930) BaiJiangJie 2020-04-22 00:22:24 +08:00
  • 9febe488b5 Merge pull request #3929 from jumpserver/lina_terminal BaiJiangJie 2020-04-21 22:23:53 +08:00
  • c8c6ba1c19 [Update] add terminal model fileds Eric 2020-04-21 17:37:29 +08:00
  • 2df7bd8510 Merge pull request #3926 from jumpserver/fix_otp_error 老广 2020-04-20 17:00:54 +08:00
  • c16a986c4b Merge pull request #3925 from jumpserver/bugfix_many_sqlquery_perm_asset 老广 2020-04-20 16:58:14 +08:00
  • 44db0e8a5d [Bugfix] 修复查询授权时额外查询platform的问题 ibuler 2020-04-20 16:56:47 +08:00
  • 91c994924f [Update] 修改报错文案 ibuler 2020-04-20 10:44:45 +08:00
  • 61407331bc [Bugfix] 修复otp登录时导致的500 ibuler 2020-04-20 10:37:07 +08:00
  • 1b1a686b96 Merge pull request #3922 from jumpserver/dev BaiJiangJie 2020-04-18 23:19:11 +08:00
  • cc30a20b7c Merge pull request #3921 from jumpserver/dev BaiJiangJie 2020-04-18 23:15:42 +08:00
  • 0379e5160c [Bugfix] 修复真实组织下,新建的用户角色显示不稳定的问题2 (#3919) BaiJiangJie 2020-04-18 23:14:25 +08:00
  • 386ce629ac Merge pull request #3918 from jumpserver/fix_connectivity BaiJiangJie 2020-04-18 10:42:55 +08:00
  • 5677bf0995 Merge pull request #3915 from jumpserver/dev BaiJiangJie 2020-04-18 01:27:09 +08:00
  • c17dc26f8c Merge pull request #3916 from jumpserver/dev_org BaiJiangJie 2020-04-18 01:24:21 +08:00
  • b4cc2bbff9 [Bugfix] 修复真实组织下,新建的用户角色显示不稳定的问题 Bai 2020-04-18 01:22:48 +08:00
  • e74289b223 [Update] 修改用户密码重置页面错误信息提示2 (#3914) BaiJiangJie 2020-04-17 23:41:50 +08:00
  • 98afa032a7 [Update] 修复资产页面可连接性 ibuler 2020-04-17 16:32:38 +08:00
  • 0d3fab216b Merge pull request #3910 from jumpserver/dev_user BaiJiangJie 2020-04-17 11:27:26 +08:00
  • 081f4b1c0a [Update] 修改用户密码重置页面错误信息提示 Bai 2020-04-17 11:26:29 +08:00
  • e9fe5b3004 Merge pull request #3908 from jumpserver/dev BaiJiangJie 2020-04-16 18:30:54 +08:00
  • 1de2923dd3 Merge pull request #3907 from jumpserver/dev_user BaiJiangJie 2020-04-16 18:30:07 +08:00
  • 6890d549ed [Update] 修改忘记密码页面的错误信息提示 Bai 2020-04-16 18:29:02 +08:00
  • 9426f58a6b Merge pull request #3904 from jumpserver/dev 老广 2020-04-15 23:17:08 -05:00
  • 6a2a0013a8 [Update] 去掉debug ibuler 2020-04-16 12:12:24 +08:00
  • 864a4c0485 [Bugfix] 修复显示未授权资产的bug ibuler 2020-04-16 12:08:52 +08:00
  • 8fa08d7ea3 Merge pull request #3902 from jumpserver/dev BaiJiangJie 2020-04-16 11:31:38 +08:00
  • 3648a1458b [Update] 修改command options get view filter ibuler 2020-04-16 11:27:46 +08:00
  • 5001f48982 Merge pull request #3899 from jumpserver/dev BaiJiangJie 2020-04-14 19:46:36 +08:00
  • 93bf15adc9 Merge pull request #3898 from jumpserver/dev_email BaiJiangJie 2020-04-14 19:45:06 +08:00
  • 83eb8f77d1 [Update] 修改测试邮件后,配置获取不稳定的Bug(显示给settings赋值导致) Bai 2020-04-14 19:40:56 +08:00
  • 4eaaa2462b Merge pull request #3897 from jumpserver/dev BaiJiangJie 2020-04-14 17:53:52 +08:00
  • 0910236f12 Merge pull request #3896 from jumpserver/dev_bai BaiJiangJie 2020-04-14 17:52:49 +08:00
  • 77149bf36c [Update] 修改监控多个会话时,总是覆盖同一个tab页 Bai 2020-04-14 17:50:47 +08:00
  • 6337d0d0a1 [Update] 修改会话can_join为property Bai 2020-04-14 16:12:24 +08:00
  • 093e3924a2 Merge pull request #3894 from jumpserver/dev BaiJiangJie 2020-04-14 16:00:08 +08:00
  • e143408e57 Merge pull request #3893 from jumpserver/dev_req BaiJiangJie 2020-04-14 15:58:24 +08:00
  • dfdf33bbb5 [Update] 修改依赖版本jms-storage=0.0.29 Bai 2020-04-14 15:54:59 +08:00
  • 8fd5e6521f Merge pull request #3892 from jumpserver/dev_bai BaiJiangJie 2020-04-14 13:20:50 +08:00
  • 6a2b9cd9bf Merge pull request #3891 from jumpserver/dev_bai BaiJiangJie 2020-04-14 13:19:57 +08:00
  • 55fa5800b1 [Update] 修复系统设置-终端设置-资产排序设置不生效的Bug Bai 2020-04-14 13:18:33 +08:00
  • 6cdba2e8d2 Merge pull request #3890 from jumpserver/dev_bai BaiJiangJie 2020-04-14 12:56:20 +08:00
  • 043aa08f23 Merge pull request #3889 from jumpserver/dev_bai BaiJiangJie 2020-04-14 12:55:35 +08:00
  • 63519ec076 [Update] 修改命令记录/操作/改密日志搜索字段没清空的问题 Bai 2020-04-14 12:51:13 +08:00
  • 48fa26a3bc [Update] 修改操作日志搜索字段没清空的问题 Bai 2020-04-14 11:03:12 +08:00
  • d969563e43 [Update] 修复自定义平台列表在详情页删除失败的bug Bai 2020-04-14 10:42:40 +08:00
  • 287236a447 Merge pull request #3885 from jumpserver/dev_trans BaiJiangJie 2020-04-13 19:23:38 +08:00
  • 4fb4a9f622 [Update] 更新翻译 Bai 2020-04-13 19:21:53 +08:00
  • 4dcd4749c3 Merge pull request #3884 from jumpserver/dev BaiJiangJie 2020-04-13 18:24:54 +08:00
  • 508d1c2c1f Merge pull request #3883 from jumpserver/master_bai BaiJiangJie 2020-04-13 18:23:43 +08:00
  • 600ea42633 Merge pull request #3882 from jumpserver/master_bai 1.5.7 BaiJiangJie 2020-04-13 18:22:23 +08:00
  • 41cbd3e0f6 [Update] 修改OpenID用户获取username的问题 Bai 2020-04-13 18:21:49 +08:00
  • e593ccb01c Merge pull request #3879 from jumpserver/dev_bai BaiJiangJie 2020-04-13 14:22:31 +08:00
  • d5e1ca7908 [Update] 添加翻译 Bai 2020-04-13 14:19:42 +08:00
  • 06fb502a1d [Update] 修改文案: 加入 -> 监控 Bai 2020-04-13 14:17:08 +08:00
  • 3f6d7637c3 [Update] 更新用户添加CAS来源选项 Bai 2020-04-13 13:40:08 +08:00
  • 0d2b4d7ca3 [Update] 添加ids filter ibuler 2020-04-13 10:40:13 +08:00
  • 42c5c02709 Merge pull request #3871 from jumpserver/lina_dev BaiJiangJie 2020-04-10 14:50:05 +08:00
  • d1d73da322 [Update] Merge from dev Bai 2020-04-10 14:46:35 +08:00
  • 88fcf8dbd7 Merge pull request #3869 from jumpserver/lina_user BaiJiangJie 2020-04-10 12:49:57 +08:00
  • 396bc9b6ae [Update] 修改用户ViewSet序列类返回的admin_orgs(解决组织管理员登录的Bug) Bai 2020-04-10 12:47:16 +08:00
  • 27ffed1be9 Merge pull request #3868 from jumpserver/dev_user BaiJiangJie 2020-04-10 12:40:12 +08:00