Commit Graph

  • 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
  • 216e0f28b9 [Update] 修改配置文件demo Bai 2020-05-19 18:36:56 +08:00
  • f3483484d7 Merge pull request #4010 from jumpserver/dev_openid BaiJiangJie 2020-05-19 18:35:30 +08:00
  • d704a35ead [Update] 修改依赖版本号 jumpserver-django-oidc-rp==0.3.7.4 Bai 2020-05-19 18:33:33 +08:00
  • b97deec1de [Update] openid 继续使用配置项 base_site_url Bai 2020-05-19 18:24:26 +08:00
  • 5b6488e1b2 Merge pull request #4008 from jumpserver/dev_bugfix BaiJiangJie 2020-05-19 15:31:10 +08:00
  • be3fdac8a9 [Update] 修复API-key不能删除的问题 Bai 2020-05-19 15:28:31 +08:00
  • 96afd82341 [Update] 修复任务列表,执行历史中stat汇总数据显示问题 Bai 2020-05-19 15:15:17 +08:00
  • 728e4b7edd [Update] 修复授权模块的信号处理监听不到的问题 Bai 2020-05-19 11:47:49 +08:00
  • 73c3de97b8 [Update] 取消用户资产页面中,资产详情系统用户值为undefine的问题 Bai 2020-05-18 18:14:19 +08:00
  • e98626988b [Update] 解决开启OpenID,为用户强制启用MFA导致,登录时报错的问题 Bai 2020-05-18 18:02:37 +08:00
  • 01a52812f0 [Update] 修改用户MFA禁用/更新的View Bai 2020-05-18 15:49:53 +08:00
  • 041d99f0be [Update] 更新remote-app用户/用户组时自动刷新页面 Bai 2020-05-18 15:40:54 +08:00
  • 75edc26a10 [Update] 修改翻译,禁用资产提示不支持ansible的错误提示 Bai 2020-05-18 15:25:24 +08:00
  • 2f7b169405 [Update] 修改授权用户/用户组页面删除用户组失败的问题 Bai 2020-05-18 15:24:55 +08:00
  • 76ef9b292b [Update] 修改public api ibuler 2020-05-18 14:55:16 +08:00
  • 1540cbdcaa [Update] 修改csv render ibuler 2020-05-18 11:52:50 +08:00
  • eefe0709f8 Merge pull request #4007 from maninhill/patch-1 BaiJiangJie 2020-05-17 07:44:37 +08:00
  • 5ae6e81a1d Update README.md maninhill 2020-05-17 00:02:35 +08:00
  • 8a62488cb9 Merge pull request #4003 from jumpserver/dev_v BaiJiangJie 2020-05-14 16:15:17 +08:00
  • e951b64b0a [Update] 修改版本号1.5.9 Bai 2020-05-14 16:14:17 +08:00
  • 5d129fd0da Merge branch 'lina' of github.com:jumpserver/jumpserver into lina ibuler 2020-05-14 14:51:05 +08:00
  • b529127461 [Update] 修改user role ibuler 2020-05-14 14:49:54 +08:00
  • 2e40b9607e Merge pull request #4002 from jumpserver/dev_bai BaiJiangJie 2020-05-14 14:28:24 +08:00
  • d878089ebd [Update] 用户资产详情Modal添加comment Bai 2020-05-14 14:26:00 +08:00
  • 9d32285446 Merge pull request #3997 from jumpserver/dev_bai BaiJiangJie 2020-05-14 11:01:35 +08:00
  • 4658a4c90f [Update] 修改向导文案 Bai 2020-05-14 11:00:24 +08:00
  • d06ea2944e [Update] 修改Dashboard API Bai 2020-05-14 10:53:30 +08:00
  • d50ea83f40 [Fix]修改文档链接 wojiushixiaobai 2020-05-13 15:21:04 +08:00
  • 154aad1e22 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina ibuler 2020-05-13 11:06:24 +08:00
  • 17163dd909 [Update] 用户Profile添加在当前组织的角色 ibuler 2020-05-13 11:05:58 +08:00
  • b789a8bb05 Merge pull request #3994 from jumpserver/lina_assetuser BaiJiangJie 2020-05-12 20:32:58 +08:00
  • 9341ce9f84 [Update] 修复AssetUserViewSet 使用Option方法时error Bai 2020-05-12 20:31:32 +08:00
  • 4d0f7d0254 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev ibuler 2020-05-12 17:57:51 +08:00
  • 195cbbbe42 [Update] 修改profile serialzier ibuler 2020-05-12 17:57:35 +08:00
  • 6e5e340a25 Merge pull request #3993 from jumpserver/update-assets-filter xinwen 2020-05-12 17:26:59 +08:00
  • eb74d13059 [Update] Asset filter 添加 platform__base 字段 xinwen 2020-05-12 17:09:36 +08:00
  • 16f916c40a Merge pull request #3992 from jumpserver/update-assets-filter 老广 2020-05-12 04:11:49 -05:00
  • 4dd6d4498b [Update] Asset filter 添加 platform__name 字段 xinwen 2020-05-12 17:09:36 +08:00
  • dd5bf546df [Update] 修改serialzier_class ibuler 2020-05-12 15:37:37 +08:00
  • d6debde566 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina ibuler 2020-05-11 19:28:24 +08:00
  • efc66cc7ee [Update] 默认关闭debug ibuler 2020-05-11 19:28:02 +08:00
  • b310731ba7 Merge pull request #3990 from jumpserver/lina_dev BaiJiangJie 2020-05-11 17:45:51 +08:00
  • 4bd2681bf0 [Update] Merge from dev to lina Bai 2020-05-11 17:43:48 +08:00
  • 38e09753f4 Merge pull request #3989 from jumpserver/dev_master BaiJiangJie 2020-05-11 17:38:46 +08:00
  • 98e3adbb11 [Update] Merge from master to dev Bai 2020-05-11 17:38:01 +08:00
  • c700b101c1 Merge pull request #3988 from jumpserver/master_otp 1.5.8 BaiJiangJie 2020-05-11 16:58:40 +08:00
  • 7b3647e78a [Bugfix] 修复用户页面更新MFA时解除管理员强制启用的Bug Bai 2020-05-11 16:56:52 +08:00
  • f4f042c407 Merge pull request #3987 from jumpserver/master_index BaiJiangJie 2020-05-11 15:20:00 +08:00
  • 0a8eeca629 [Update] 仪表盘缓存key添加组织id Bai 2020-05-11 15:12:42 +08:00
  • fdd55511a6 Merge pull request #3986 from jumpserver/lina_dev BaiJiangJie 2020-05-11 14:04:52 +08:00
  • 0cff6ab29b [Update] Merge fromo dev to lina Bai 2020-05-11 14:03:24 +08:00
  • cda677a30f [update] 修改remote apps的serializer ibuler 2020-05-11 12:35:33 +08:00
  • 5571651c02 [Update] 升级requirements ibuler 2020-05-09 16:13:06 +08:00
  • 2680396680 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina ibuler 2020-05-09 16:08:32 +08:00
  • 227f97c2f5 [Update] 修改remote apps 字段 ibuler 2020-05-09 16:08:09 +08:00
  • ad3231c8a3 Merge pull request #3982 from jumpserver/update-ops-migrate 老广 2020-05-09 01:54:37 -05:00
  • e39d8dce3c [Update] 修改fields ibuler 2020-05-09 14:52:44 +08:00
  • 0bdc425c55 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina ibuler 2020-05-09 14:51:47 +08:00
  • 0a7f63cc5e [Update] 修改remote app api ibuler 2020-05-09 14:51:19 +08:00
  • c6e0e9a79a [Update] 重建 ops 0018 迁移脚本 xinwen 2020-05-09 14:50:22 +08:00
  • 4cebfc7f6a [Update] 修改翻译 (#3981) BaiJiangJie 2020-05-09 13:29:39 +08:00
  • 7fde392774 Merge pull request #3980 from jumpserver/update-audits-verbose 老广 2020-05-08 22:40:34 -05:00
  • 3ee051303a [Update] audits 模块为一些 models 字段添加 verbose 信息 xinwen 2020-05-09 11:28:39 +08:00
  • 9fa31be4bf Merge pull request #3976 from jumpserver/add-audits-apis 老广 2020-05-08 08:04:14 -05:00
  • ae2e4049db Merge pull request #3979 from jumpserver/lina_setting_dict_field 老广 2020-05-08 08:02:04 -05:00
  • 48b71bb11b AUTH_LDAP_USER_ATTR_MAP to Dict field Eric 2020-05-08 16:48:36 +08:00
  • 7e4edc3c63 Merge pull request #3978 from jumpserver/dev_index BaiJiangJie 2020-05-08 20:03:08 +08:00
  • 11b3c57c92 [Update] 修改dashboard中使用的变量名 Bai 2020-05-08 20:02:00 +08:00
  • e339ed1fb3 [Add] audits apis xinwen 2020-05-08 16:48:26 +08:00
  • 2d48c8028b Merge pull request #3975 from jumpserver/dev_master BaiJiangJie 2020-05-08 16:42:32 +08:00
  • 185c53d311 [Update] Merge from master to dev Bai 2020-05-08 16:39:49 +08:00
  • 2f030c02ec Merge pull request #3973 from jumpserver/master_org BaiJiangJie 2020-05-08 16:27:49 +08:00
  • f4457ff1e2 Merge pull request #3972 from jumpserver/PERM_CACHE_CONFIG 老广 2020-05-08 03:04:33 -05:00
  • c6ed6d8acb [Update] 去掉debug信息 ibuler 2020-05-08 15:58:00 +08:00
  • 331cfe2aed [Bugfix] 修复节点数量缓存显示不对的bug ibuler 2020-05-08 15:53:58 +08:00
  • e48dbabef2 [Update] 修改翻译 Bai 2020-05-08 15:50:01 +08:00
  • 181973f235 [Update] 优化仪表盘页面加载 Bai 2020-05-08 15:41:56 +08:00
  • 440a2ad241 Merge branch 'PERM_CACHE_CONFIG' into dev ibuler 2020-05-08 14:25:36 +08:00
  • 1936a6d5ee [Update] 去掉perms cache enable settings ibuler 2020-05-08 14:25:28 +08:00
  • 4517a92b2b Merge pull request #3971 from jumpserver/add-ftp-log-api 老广 2020-05-08 00:52:03 -05:00
  • 44a2a51f59 Merge branch 'PERM_CACHE_CONFIG' into dev ibuler 2020-05-08 13:13:47 +08:00
  • 2d4498578a [Update] 修改授权缓存配置的默认值 ibuler 2020-05-08 13:13:38 +08:00
  • ac902501ec [Add] ftp-logs api xinwen 2020-05-08 12:46:18 +08:00
  • 363b5d04d9 Merge pull request #3969 from jumpserver/update-login-logs 老广 2020-05-07 22:23:37 -05:00
  • dec89ae5ee [Update] login-logs api 添加 mfa_display xinwen 2020-05-08 10:08:16 +08:00
  • 5d37269a6c Merge pull request #3967 from jumpserver/lina_status_code 老广 2020-05-07 04:03:34 -05:00
  • 9a39ccd37d [Update] Reponse status code from 401 to 400 Eric 2020-05-07 16:57:57 +08:00
  • 5896ea9c63 Merge pull request #3963 from jumpserver/dev_oidc BaiJiangJie 2020-05-06 21:06:27 +08:00
  • 8323de1c07 [Update] 修改依赖版本jumpserver-django-oidc-rp==0.3.7.3 Bai 2020-05-06 21:05:23 +08:00
  • 8c0bf0b71b [Update] Login log 添加display field ibuler 2020-05-06 19:35:19 +08:00
  • 5812c50a33 Merge pull request #3960 from jumpserver/lina_setting 老广 2020-05-06 04:05:51 -05:00