Commit Graph

  • 1f6a8e8f02 Merge pull request #3698 from jumpserver/readme 老广 2020-03-12 10:39:26 +08:00
  • eca0a9a7d7 Merge pull request #3723 from jumpserver/settings_bug 老广 2020-02-26 16:19:39 +08:00
  • 775f8f2ffd Merge pull request #3722 from jumpserver/settings_bug 老广 2020-02-26 16:18:24 +08:00
  • 1e8ef8c925 [Update] Merge with master ibuler 2020-02-26 16:15:42 +08:00
  • c354b55f61 [update] 修复获取settings有问题的bug ibuler 2020-02-26 16:12:41 +08:00
  • 76ac0215fe [update] 修复获取settings有问题的bug ibuler 2020-02-26 16:12:08 +08:00
  • 4f93a3ca92 Merge pull request #3716 from jumpserver/dev 老广 2020-02-24 12:08:32 +08:00
  • bcae30814d [Update] 修改导入 ibuler 2020-02-24 12:06:02 +08:00
  • 98bb6c63f5 [Update] 修改切换组织后页面跳转 (#3715) 老广 2020-02-24 12:00:20 +08:00
  • 8b8b11ce1e [Update] 恢复到原来的sql (#3707) 老广 2020-02-15 20:49:20 +08:00
  • 5f61f2b555 Merge pull request #3702 from jumpserver/dev_interface BaiJiangJie 2020-02-14 10:45:37 +08:00
  • 62d2e01cdf [Update] 修改终端获取登录标题配置的逻辑 Bai 2020-02-14 10:40:18 +08:00
  • 5e89ee9202 [Update] 修改README中 jumpserver ==> JumpServer jym503558564 2020-02-13 19:58:14 +08:00
  • 5d313a827b [Update] 优化session 索引 is_finished (#3697) 老广 2020-02-13 15:17:13 +08:00
  • edf6baa52d [Update] 修改api创建的token有效期是600s ibuler 2020-02-07 17:24:52 +08:00
  • 3c69860b24 [Update] 优化sql, or方式改为union (#3682) 老广 2020-02-05 15:56:28 +08:00
  • aa2255a87e [Update] sql优化,查询用户资产权限时,使用union替代or (#3681) 老广 2020-02-05 12:10:24 +08:00
  • 3cc9e0a66c Merge pull request #3680 from jumpserver/dev 1.5.6 BaiJiangJie 2020-02-03 14:25:24 +08:00
  • ec1f6677ec Merge pull request #3679 from jumpserver/dev_session BaiJiangJie 2020-02-03 14:08:37 +08:00
  • ae98fb4332 [Bugfix] 处理心跳时guacamole上报的session为str处理为list Bai 2020-02-03 13:54:59 +08:00
  • 29730757b8 Infer User.name from OpenID UserInfo.name (#3674) Yanzhe Lee 2020-01-27 10:15:06 +08:00
  • 1c2feedb27 Merge pull request #3661 from jumpserver/dev BaiJiangJie 2020-01-20 11:36:18 +08:00
  • b227d9cdc1 Merge pull request #3660 from jumpserver/dev_auth BaiJiangJie 2020-01-20 11:28:40 +08:00
  • da6a0c286d [Update] 修复用户更新页面会清空用户public_key的问题 Bai 2020-01-20 11:27:34 +08:00
  • 13a042bc0f Merge pull request #3658 from jumpserver/dev_loginip BaiJiangJie 2020-01-19 12:14:34 +08:00
  • 7f9644dbac [Update] 修改获取用户登录的ip和type Bai 2020-01-19 12:13:42 +08:00
  • ece9b16351 Merge pull request #3651 from jumpserver/dev BaiJiangJie 2020-01-16 11:39:26 +08:00
  • 23b896b301 Merge pull request #3650 from jumpserver/dev_i18n BaiJiangJie 2020-01-16 11:31:55 +08:00
  • dd52baae12 [Update] 翻译应用树更节点(API) Bai 2020-01-16 11:31:08 +08:00
  • eb1ca4c0f2 Merge pull request #3649 from jumpserver/dev_copyright BaiJiangJie 2020-01-16 10:36:48 +08:00
  • 8e75e519fa [Update] 修改copyright Bai 2020-01-16 10:35:00 +08:00
  • 389c6b5a84 Merge pull request #3648 from jumpserver/dev_i18n BaiJiangJie 2020-01-16 09:59:22 +08:00
  • 6fc7a4cb21 [Update] 更新翻译 Bai 2020-01-16 09:58:00 +08:00
  • 68455156a3 Merge pull request #3646 from jumpserver/dev_ops BaiJiangJie 2020-01-15 10:47:39 +08:00
  • 2827a64095 [Update] 更新命令批量执行资产树(将没有ssh协议的资产设置为nocheck) Bai 2020-01-15 10:46:41 +08:00
  • c21505e92d Merge pull request #3644 from jumpserver/dev_ops BaiJiangJie 2020-01-14 17:34:40 +08:00
  • 7d855e5ad8 [Update] 批量命令执行开放rdp系统用户 Bai 2020-01-14 17:33:34 +08:00
  • 17956bf0db Merge pull request #3633 from jumpserver/dev BaiJiangJie 2020-01-14 16:56:04 +08:00
  • 267a7fc9f7 Merge pull request #3643 from jumpserver/dev_i18n BaiJiangJie 2020-01-14 16:55:44 +08:00
  • 9ef4762817 [Update] 更新翻译 Bai 2020-01-14 16:54:52 +08:00
  • 29457ad867 Assets_permission_action 优化 (#3585) 八千流 2020-01-14 16:44:28 +08:00
  • d5082d1379 Merge pull request #3639 from jumpserver/dev_su_detail BaiJiangJie 2020-01-14 11:08:32 +08:00
  • c07536b26f [Update] 系统用户详情(mysql)开放命令过滤器 Bai 2020-01-14 11:07:35 +08:00
  • 678999b9f5 Merge pull request #3638 from jumpserver/dev_su_mysql BaiJiangJie 2020-01-14 11:03:29 +08:00
  • 4295aec492 [Update] 系统用户(mysql)开放命令过滤器 Bai 2020-01-14 10:53:46 +08:00
  • 75a2b9eac2 Merge pull request #3636 from jumpserver/dev_perms BaiJiangJie 2020-01-13 18:57:33 +08:00
  • 2fc68ca6f1 [Update] 授权的 RemoteApp/DatabaseApp 进行去重 Bai 2020-01-13 18:56:58 +08:00
  • 56a156b717 Merge pull request #3634 from jumpserver/dev_req BaiJiangJie 2020-01-13 17:28:44 +08:00
  • 7c59134635 [Update] 修改依赖 Bai 2020-01-13 17:28:00 +08:00
  • f98f0e2c06 Merge pull request #3632 from jumpserver/dev_i18n BaiJiangJie 2020-01-13 14:24:41 +08:00
  • 63746accf9 [Update] 修改js默认语言为中文 Bai 2020-01-13 14:23:33 +08:00
  • 670e2d7352 [Update] 更新翻译 Bai 2020-01-13 14:13:45 +08:00
  • db3b60faf9 Merge pull request #3631 from jumpserver/dev_admin_user BaiJiangJie 2020-01-13 14:09:39 +08:00
  • f1b8c1965d [Update] 修改删除管理用户(存在关联资产)的Bug Bai 2020-01-13 14:07:42 +08:00
  • aa2a77ee7e Merge pull request #3630 from jumpserver/dev_req BaiJiangJie 2020-01-13 13:52:31 +08:00
  • b107d15097 [Update] 修改依赖 Bai 2020-01-13 13:51:59 +08:00
  • 52b9c400eb Merge pull request #3629 from jumpserver/dev BaiJiangJie 2020-01-13 12:51:13 +08:00
  • 851bd99eaf Merge pull request #3628 from jumpserver/dev_node BaiJiangJie 2020-01-13 12:50:49 +08:00
  • 0c0eb843ab [Update] 修改资产树移动资产的问题 Bai 2020-01-13 12:50:01 +08:00
  • bd19f8afe8 Merge pull request #3624 from jumpserver/dev BaiJiangJie 2020-01-10 18:27:49 +08:00
  • bafffc95b8 Merge pull request #3621 from jumpserver/dev_node BaiJiangJie 2020-01-10 16:47:44 +08:00
  • 14581ac775 [Update] 资产节点添加资产时,祖先节点授权的系统用户关联对应资产 Bai 2020-01-10 16:46:18 +08:00
  • 6ddd48bfb1 Merge pull request #3618 from jumpserver/dev_swift BaiJiangJie 2020-01-10 11:44:23 +08:00
  • ff1828bdd6 [Update] 修改Swift录像存储创建参数及API返回值 Bai 2020-01-10 11:42:53 +08:00
  • 84e5177ce2 Merge pull request #3614 from jumpserver/dev_ldap BaiJiangJie 2020-01-09 11:18:12 +08:00
  • 1c9be184fd [Update] 修改LDAP认证逻辑,密码为空时认证失败 Bai 2020-01-09 11:16:13 +08:00
  • 57155c2469 [Update] 更新 Readme (#3608) BaiJiangJie 2020-01-08 12:17:56 +08:00
  • f9578f4474 Merge pull request #3606 from jumpserver/dev BaiJiangJie 2020-01-07 17:34:07 +08:00
  • a37e14221e Merge pull request #3603 from jumpserver/dev_systemuser BaiJiangJie 2020-01-07 15:56:16 +08:00
  • 005272cdc0 [Update] 更新系统用户认证信息private_key转换 Bai 2020-01-07 15:53:53 +08:00
  • f88cb3da20 Merge pull request #3600 from jumpserver/dev_i18n BaiJiangJie 2020-01-06 18:24:14 +08:00
  • 9f42dfb26e [Update] dateRange插件支持i18n 2 Bai 2020-01-06 18:23:35 +08:00
  • f702fc7d93 [Update] dateRange插件支持i18n Bai 2020-01-06 18:21:05 +08:00
  • 05adb4e95f Merge pull request #3598 from jumpserver/dev_terminal BaiJiangJie 2020-01-06 15:36:51 +08:00
  • 210a2d7fe6 [Update] 更新Session表asset字段长度128 Bai 2020-01-06 15:36:03 +08:00
  • c9dc1ea254 Merge pull request #3596 from jumpserver/dev_ops BaiJiangJie 2020-01-06 14:48:08 +08:00
  • 79b5618756 [Update] 修改作业中心批量命令资产树收藏夹循环现实的问题 Bai 2020-01-06 14:46:59 +08:00
  • bf922459ff [Update] 修改创建按钮样式;Open 数据库应用;取消资产/系统用户/组织等名称对于特殊字符的限制; (#3594) BaiJiangJie 2020-01-06 11:43:37 +08:00
  • a27fb18a17 Merge pull request #3591 from jumpserver/dev BaiJiangJie 2020-01-03 17:03:37 +08:00
  • f62f750266 Merge pull request #3588 from jumpserver/dev_mfa BaiJiangJie 2020-01-03 15:31:43 +08:00
  • b072e98148 [Update] 修改确认用户认证成功和绑定MFA的前后逻辑(解决绕过绑定MFA的漏洞;解决管理员重置用户MFA后自动退出的问题) BaiJiangJie 2020-01-03 15:26:38 +08:00
  • 352bfeeb7a [Update] 绑定MFA页面(二维码显示) BaiJiangJie 2020-01-03 11:41:07 +08:00
  • 1d7bdd5f5f Merge pull request #3586 from jumpserver/dev_bai BaiJiangJie 2020-01-02 16:25:07 +08:00
  • 8702761303 [Bugfix] 修改BlockLoginError的msg值在初始化中设置(数据表没生成之前启动会有问题) BaiJiangJie 2020-01-02 16:24:13 +08:00
  • ce3cc80037 Merge pull request #3583 from jumpserver/dev_version BaiJiangJie 2019-12-31 18:50:56 +08:00
  • 9556d33d1c [Update] 修改版本号(v1.5.6) BaiJiangJie 2019-12-31 18:49:16 +08:00
  • 02650c9cdc Merge pull request #3582 from jumpserver/dev_session BaiJiangJie 2019-12-31 16:49:20 +08:00
  • 75c6047236 [Update] 添加清除幽灵mysql会话 BaiJiangJie 2019-12-31 16:47:25 +08:00
  • e6c369cfd8 Merge pull request #3581 from jumpserver/dev_session BaiJiangJie 2019-12-31 15:39:04 +08:00
  • 131496bfee [Update] 添加清除幽灵rdp会话 BaiJiangJie 2019-12-31 15:38:10 +08:00
  • c084412e53 [Update] 解决Vault翻页再次选择资产时不能设置到select框的问题:select.style === single 时 (#3579) BaiJiangJie 2019-12-30 16:40:38 +08:00
  • ad81d6c28e Merge pull request #3576 from jumpserver/dev_audit BaiJiangJie 2019-12-30 12:27:58 +08:00
  • 08fb8f5d92 [Update] 修改操作日志title文案:操作者 BaiJiangJie 2019-12-30 12:27:14 +08:00
  • 4df08f0521 Merge pull request #3575 from jumpserver/dev_storage BaiJiangJie 2019-12-30 11:55:25 +08:00
  • c963937f00 [Update] 命令存储ES字段设置为required BaiJiangJie 2019-12-30 11:54:36 +08:00
  • b64ae358fb Merge pull request #3572 from jumpserver/dev_bai BaiJiangJie 2019-12-27 16:59:30 +08:00
  • 42c5783e43 [Update] 修改右击节点rMenu菜单show offset BaiJiangJie 2019-12-27 16:42:36 +08:00
  • a2350e7f1d Merge pull request #3571 from jumpserver/bugfix BaiJiangJie 2019-12-27 16:05:28 +08:00
  • b3114a1f3d [Bugfix] 修复vault导出选择id的bug ibuler 2019-12-27 16:03:45 +08:00
  • b4cf540e51 [Update] 操作日志添加新的Record Model;用户登录日志采用同步机制;修改DatabaseAppAPI权限(加入AppUser); (#3570) BaiJiangJie 2019-12-27 16:00:32 +08:00