Commit Graph

  • a7e1ed6f03 fix:修改 ftp 日志按开始日期排序 jym503558564 2020-06-23 18:24:45 +08:00
  • eba9f2325a Merge pull request #4204 from jumpserver/dev_login_password_encrypt BaiJiangJie 2020-06-30 18:57:51 +08:00
  • b46e772d09 feat(login password ecrypt): 登录密码加密传输 4 Bai 2020-06-30 18:35:01 +08:00
  • 183df82a75 feat(login password ecrypt): 登录密码加密传输 3 Bai 2020-06-30 18:14:53 +08:00
  • 98c91d0f18 feat(login password ecrypt): 登录密码加密传输(添加翻译) Bai 2020-06-30 17:37:16 +08:00
  • e17d875206 feat(login password ecrypt): 登录密码加密传输2 Bai 2020-06-30 17:23:56 +08:00
  • 4b1e84ed8a Merge branch 'dev' into dev_login_password_encrypt Bai 2020-06-30 17:13:08 +08:00
  • 71ee33e3be feat(login password ecrypt): 登录密码加密传输 Bai 2020-06-30 17:12:38 +08:00
  • 1c6f89519a Merge pull request #4201 from jumpserver/fix-i18n xinwen 2020-06-30 14:21:44 +08:00
  • 24d093747f [Fix] X-Pack/云管中心 i18n xinwen 2020-06-30 14:15:35 +08:00
  • 5dd24f5cf9 Merge pull request #4188 from jumpserver/limit-upload-csv xinwen 2020-06-28 19:13:53 +08:00
  • 2b6e818943 [Update] 限制上传CSV文件的大小 xinwen 2020-06-28 19:02:20 +08:00
  • 8c4e9720d3 Merge pull request #4183 from jumpserver/fix_template 老广 2020-06-28 15:22:41 +08:00
  • d43709f584 docs(github): 修改 github issue 模板 ibuler 2020-06-28 15:17:15 +08:00
  • 89496baae5 Merge pull request #4148 from jumpserver/v2.0 BaiJiangJie 2020-06-28 10:47:56 +08:00
  • ea6d995f55 Merge pull request #4147 from jumpserver/v2.0_bugfix_csv BaiJiangJie 2020-06-28 10:46:31 +08:00
  • cf6aba1f38 [Update] 修改csv导出,最大限制条目数从100->10000条 Bai 2020-06-28 10:43:47 +08:00
  • fdcda83c93 Merge pull request #4142 from jumpserver/sftp-log-i18n BaiJiangJie 2020-06-24 17:30:57 +08:00
  • 6e3369c944 [Update] sftp log页面操作翻译 xinwen 2020-06-24 16:17:58 +08:00
  • edf72d3e4f Merge pull request #4140 from jumpserver/bug-fix BaiJiangJie 2020-06-24 16:21:09 +08:00
  • 355edce635 [Fix] 没有设置 *邮件默认主题* 邮件发送不成功 xinwen 2020-06-24 15:09:23 +08:00
  • d7e432a851 Merge pull request #4139 from jumpserver/dev_session BaiJiangJie 2020-06-24 16:14:36 +08:00
  • c0a153d13a [Update] UserProfileAPI 判断是否设置session过期时间,解决前端关闭浏览器session未失效的问题 Bai 2020-06-24 10:52:05 +08:00
  • 465fec3774 Merge pull request #4133 from jumpserver/fix-mfa-1.5 老广 2020-06-22 19:09:35 +08:00
  • 2acc1dc875 Merge pull request #4134 from jumpserver/fix-mfa-1.5 2.0.1 老广 2020-06-22 19:05:15 +08:00
  • 32ed43ba7b Merge branch 'v2.0' into fix-mfa-1.5 xinwen 2020-06-22 19:04:42 +08:00
  • 3e993fd044 [Update] 调整MFA绑定策略 V2 xinwen 2020-06-22 17:04:07 +08:00
  • 005573b53b [Fix] 重新绑定 MFA 的漏洞 xinwen 2020-06-19 17:43:15 +08:00
  • e04e31eb30 Merge pull request #4129 from jumpserver/readme 老广 2020-06-22 12:08:28 +08:00
  • ff747f9e42 feat: readme 添加docker pull ibuler 2020-06-22 12:06:42 +08:00
  • c4bd093fd7 Merge pull request #4126 from jumpserver/v2.0 BaiJiangJie 2020-06-20 19:26:12 +08:00
  • 408b2d6dbd Merge pull request #4125 from jumpserver/v2.0_bugfix BaiJiangJie 2020-06-20 19:24:17 +08:00
  • ebc63b9410 Merge pull request #4123 from jumpserver/v1.5_bugfix BaiJiangJie 2020-06-20 16:20:53 +08:00
  • f1e5c7c2bb 添加改密计划安全模式配置项 Michael Bai 2020-06-20 16:18:58 +08:00
  • fcb0aefe3c 更改改密计划安全模式配置项名 Michael Bai 2020-06-20 15:47:39 +08:00
  • 29666cc8d3 [Update] 添加改密计划安全模式配置项 Bai 2020-06-19 20:41:51 +08:00
  • 1d640eccf6 [Fix] /opt/jumpserver/apps/jumpserver/views/index.py redirect(assets:user-asset-list) (#4121) xinwen 2020-06-19 18:28:43 +08:00
  • 92fc0ceb16 Merge pull request #4118 from jumpserver/master 2.0.0 BaiJiangJie 2020-06-18 15:03:32 +08:00
  • 217ea03c18 Merge pull request #4117 from jumpserver/dev BaiJiangJie 2020-06-18 15:02:40 +08:00
  • 923f0ed477 Update README.md BaiJiangJie 2020-06-18 15:01:08 +08:00
  • 3c6cfaa6cf Update README.md BaiJiangJie 2020-06-18 14:59:13 +08:00
  • 0bfe255966 Update README.md BaiJiangJie 2020-06-18 14:58:00 +08:00
  • af5d531131 Merge pull request #4116 from jumpserver/dev BaiJiangJie 2020-06-18 10:56:36 +08:00
  • 10d58ef424 [Update] Merge from master to dev Bai 2020-06-17 19:30:37 +08:00
  • 64064cb526 [Update] 注释节点树print Bai 2020-06-17 17:47:45 +08:00
  • 46941037dd add SECURITY_COMMAND_EXECUTION (#4114) Eric_Lee 2020-06-17 15:03:41 +08:00
  • 7548bb8976 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev ibuler 2020-06-17 11:33:57 +08:00
  • 8ffa5e0aec 添加example api ibuler 2020-06-16 20:11:50 +08:00
  • 8ad71b6dd9 [Update] Move LOCAL_DYNAMIC_SETTINGS (#4113) xinwen 2020-06-16 18:11:23 +08:00
  • 220ccda04d fix: 修改domain创建的assets不是必填的 ibuler 2020-06-16 17:55:18 +08:00
  • 6d30fe797c fix ldap test bug (#4110) Eric_Lee 2020-06-16 17:25:57 +08:00
  • 3318df1771 [Fix] 日志审计/FTP日志 (#4109) xinwen 2020-06-16 16:33:53 +08:00
  • 0ccd806eca add system user perm api (#4108) Eric_Lee 2020-06-16 16:12:59 +08:00
  • 7ebe1c2916 [Update] 优化 dynamic settings (#4107) xinwen 2020-06-16 15:54:19 +08:00
  • 08904c2a9f Merge branch 'dev' of github.com:jumpserver/jumpserver into dev ibuler 2020-06-16 15:30:39 +08:00
  • 19e34270d1 feat: gather user添加搜索字段 ibuler 2020-06-16 15:30:25 +08:00
  • afa515d570 Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev Bai 2020-06-16 15:04:38 +08:00
  • bcba408517 [Update] 修改用户source默认local Bai 2020-06-16 15:04:01 +08:00
  • 80d94074e7 feat: 修改资产的标签搜索 ibuler 2020-06-16 14:56:19 +08:00
  • 9347405f08 feat: terminal增加搜索 ibuler 2020-06-16 13:50:21 +08:00
  • da4ad11a69 fix: 修改session command 翻译 ibuler 2020-06-16 13:39:49 +08:00
  • b81e424e80 fix: 修改翻译 ibuler 2020-06-16 12:20:16 +08:00
  • 1f15937139 feat: 修改翻译,添加settings ibuler 2020-06-16 11:04:59 +08:00
  • f4fa011714 [Update] 修改mfa校验code无效翻译 Bai 2020-06-15 20:31:50 +08:00
  • c5a9a85818 [Update] 完善 作业中心/任务列表 (#4105) xinwen 2020-06-15 19:42:36 +08:00
  • e23bfa0f69 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev ibuler 2020-06-15 17:55:13 +08:00
  • 451690fe8b fix: 修改重定向 ibuler 2020-06-15 17:44:40 +08:00
  • 5bea782b9f add assignee field for ticket (#4104) Eric_Lee 2020-06-15 17:24:05 +08:00
  • f26f7ca1e7 [Update] 修改parsers,处理dict字段值;解决remote-app csv导入时异常 Bai 2020-06-15 16:34:51 +08:00
  • fb9ac54843 Merge pull request #4103 from jumpserver/master_mfa 1.5.9 BaiJiangJie 2020-06-15 13:57:35 +08:00
  • 927ca162d0 [Update] 修改MFA应用下载图片 Bai 2020-06-15 13:55:56 +08:00
  • 583d295fd1 Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev Bai 2020-06-15 13:50:05 +08:00
  • b51af1f7d7 [Update] 修改MFA应用下载图片 Bai 2020-06-15 13:49:51 +08:00
  • edcf9921fe [Update] apps/assets/serializers/system_user.py (#4102) xinwen 2020-06-15 13:24:52 +08:00
  • eef172d0e2 Merge pull request #4098 from jumpserver/fix-ops-adhoc Eric_Lee 2020-06-12 12:23:05 +08:00
  • 5b407fe8bc Merge pull request #4095 from jumpserver/update-user Eric_Lee 2020-06-12 12:22:16 +08:00
  • 1bb9048910 [Update] 标签序列类assets字段required为False Bai 2020-06-12 11:45:03 +08:00
  • 787cdbcadf [Fix] ops.models.adhoc (#4096) xinwen 2020-06-11 20:30:59 +08:00
  • b14ca14120 [Fix] ops.models.adhoc (#4096) xinwen 2020-06-11 20:30:59 +08:00
  • 4b2fd0d0da fix: 修复系统用户过滤权限规则的bug ibuler 2020-06-11 19:36:34 +08:00
  • 3393f18399 [Update] 修改 用户相关 Serializer xinwen 2020-06-11 18:24:56 +08:00
  • 7e1a379e47 feat: 修改org返回的数据结构 ibuler 2020-06-11 18:05:18 +08:00
  • 213fdd461b fix: 修改翻译 ibuler 2020-06-11 14:33:42 +08:00
  • 148c7ffb43 fix: 添加注释 ibuler 2020-06-11 14:10:55 +08:00
  • 75be45ce43 feat: 使用新的对称加密方式: aes ibuler 2020-06-11 12:10:00 +08:00
  • 04eb670ada Merge branch 'dev' of github.com:jumpserver/jumpserver into dev ibuler 2020-06-11 11:29:28 +08:00
  • 66f3706142 feat: 添加aes fix: 修改时区的bug ibuler 2020-06-11 11:28:37 +08:00
  • 9ea98bf2b2 [Feature] 添加 会话管理/历史会话/下载 api (#4093) xinwen 2020-06-10 17:34:56 +08:00
  • 4695f80172 faet: 修改翻译 ibuler 2020-06-10 17:17:16 +08:00
  • 0452d53c3f Merge branch 'dev' of github.com:jumpserver/jumpserver into dev ibuler 2020-06-10 16:00:24 +08:00
  • ec30ef1f8b feat: readme添加版本说明 ibuler 2020-06-10 15:57:41 +08:00
  • 1c0ad08d80 fix ldap test i18n msg (#4092) Eric_Lee 2020-06-10 15:10:43 +08:00
  • e1ab453780 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev ibuler 2020-06-10 12:58:43 +08:00
  • 1a6597b572 feat: 修改command filter数据结构 ibuler 2020-06-10 12:58:18 +08:00
  • 865522953a [Feature] 作业中心/任务列表/任务详情 最后运行成功或失败的主机 (#4090) xinwen 2020-06-09 20:26:23 +08:00
  • 4d4a107101 feat: 修改oid获取顺序,添加从cookie中获取 ibuler 2020-06-09 16:43:07 +08:00
  • 82f70cb0dc feat: ticket添加翻译 ibuler 2020-06-09 16:10:31 +08:00
  • 820186c6d0 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev ibuler 2020-06-09 15:16:01 +08:00
  • 4468e2d379 feat: 限制gateway 仅有ssh协议 ibuler 2020-06-09 15:08:15 +08:00
  • bd802e6a50 add logo urls (#4088) Eric_Lee 2020-06-09 14:06:11 +08:00