Commit Graph

  • cf719f492d [Update] 修改user group relations api ibuler 2019-10-24 14:36:01 +08:00
  • 69bcf3de2e Merge pull request #3381 from jumpserver/dev BaiJiangJie 2019-10-24 12:43:05 +08:00
  • d3cf2afb51 Merge pull request #3380 from jumpserver/dev_req BaiJiangJie 2019-10-24 12:27:04 +08:00
  • 3c5ebeeb20 [Update] 更新依赖版本号 BaiJiangJie 2019-10-24 12:23:39 +08:00
  • 58f564b028 Merge pull request #3379 from jumpserver/dev BaiJiangJie 2019-10-24 12:22:25 +08:00
  • 8fd65a372e Merge pull request #3378 from jumpserver/dev_req BaiJiangJie 2019-10-24 12:10:49 +08:00
  • f8f1aee997 [Update] 更新依赖包版本 BaiJiangJie 2019-10-24 12:08:48 +08:00
  • 9bb7c1adc1 [Update] 更改命令执行超时提示 ibuler 2019-10-24 10:23:31 +08:00
  • d5cb0a2e59 [Update] Merge with dev ibuler 2019-10-23 15:25:06 +08:00
  • 7c4dee324f Merge pull request #3377 from jumpserver/dev BaiJiangJie 2019-10-23 15:25:04 +08:00
  • 4c1821e42e Merge pull request #3376 from jumpserver/dev_v BaiJiangJie 2019-10-23 15:23:57 +08:00
  • f31ed0afb8 [Update] 修改版本号(1.5.4) BaiJiangJie 2019-10-23 15:20:56 +08:00
  • 5e5f3ad383 Merge pull request #3375 from jumpserver/dev BaiJiangJie 2019-10-23 15:18:35 +08:00
  • f802fb645d [Update] Add debug message ibuler 2019-10-23 11:01:39 +08:00
  • 93e8c9e534 Merge pull request #3374 from jumpserver/dev 老广 2019-10-23 10:17:45 +08:00
  • 0b405fdefa Merge pull request #3373 from jumpserver/bugfix 老广 2019-10-23 10:17:09 +08:00
  • c995050ed7 [Update] 修改ws read celery log file ibuler 2019-10-23 10:14:07 +08:00
  • 0dbf2ab2e5 [Update] 修改websocket读取日志 ibuler 2019-10-22 19:45:03 +08:00
  • 22cc8ffbdd Merge pull request #3370 from jumpserver/bugfix 老广 2019-10-22 19:33:01 +08:00
  • 6b8b0f4a0b [Update] 修改terminal字体 ibuler 2019-10-22 19:30:53 +08:00
  • b3502a9291 [Update] 修改terminal字体 ibuler 2019-10-22 19:30:39 +08:00
  • 1c92516fd0 Merge pull request #3369 from jumpserver/dev BaiJiangJie 2019-10-22 19:11:55 +08:00
  • c3f02dbaab Merge pull request #3368 from jumpserver/dev_icon BaiJiangJie 2019-10-22 19:11:11 +08:00
  • 214c4d2f75 [Update] 修改icon图片 jym503558564 2019-10-22 19:07:23 +08:00
  • 5a98b61c1e Merge pull request #3367 from jumpserver/dev BaiJiangJie 2019-10-22 18:57:39 +08:00
  • 11ae5a4a4a Merge pull request #3365 from jumpserver/login_log_bugfix BaiJiangJie 2019-10-22 17:43:57 +08:00
  • 5f3583279c [Update] 优化登录日志时间范围 2 BaiJiangJie 2019-10-22 17:42:28 +08:00
  • 950358f5ba [Update] 优化登录日志时间范围 BaiJiangJie 2019-10-22 17:40:55 +08:00
  • 84b3e29db6 Merge pull request #3366 from jumpserver/bugfix BaiJiangJie 2019-10-22 17:30:22 +08:00
  • a33d5cc53b [Update] 修改返回asset tree带上组织 ibuler 2019-10-22 17:21:54 +08:00
  • 3c7fa1b60b [Update] 修改小问题 jym503558564 2019-10-22 16:26:46 +08:00
  • f4fc757379 [Bugfix] 修改导出登录日志的日期选择从开始时间的00:00:00,到结束时间的23:59:59 jym503558564 2019-10-22 16:17:42 +08:00
  • 7cf617c3fc [Update] 修改jms启动脚本,stop时增加超时检测 ibuler 2019-10-22 16:09:21 +08:00
  • 87deb18791 [Update] 修改command 批量执行左侧选择系统用户 ibuler 2019-10-22 15:53:24 +08:00
  • 82a6369568 [Update] 修改term大小 ibuler 2019-10-22 15:38:49 +08:00
  • 3a10fd4160 [Update] 修改查看auth info可以关闭mfa ibuler 2019-10-22 12:16:50 +08:00
  • a2f8f43321 [Update] 修改查看auth info可以关闭mfa ibuler 2019-10-22 11:31:15 +08:00
  • 6ebe8e16bd [Update] 修改读取日志时可能解码失败 ibuler 2019-10-21 19:28:33 +08:00
  • 86522627d3 [Update] 优化提交api报错时滚动到,优化table页面某些列宽度 ibuler 2019-10-21 19:07:35 +08:00
  • 334e3bef0e Merge pull request #3363 from jumpserver/dev_ug BaiJiangJie 2019-10-21 18:46:43 +08:00
  • 0930716a54 [Update] 优化用户组详情,用户选择下拉列表使用异步加载;命令过滤详情绑定到系统用户点击不关闭; BaiJiangJie 2019-10-21 18:45:12 +08:00
  • f984acf1b2 [Bugfix] 修复导致favorite 和 empty 同时出现 ibuler 2019-10-21 17:14:49 +08:00
  • 87c7452d19 [Update] 修改email msg ibuler 2019-10-21 17:02:16 +08:00
  • 792fc3b0f0 [Update] 添加koko访问错误说明 ibuler 2019-10-21 15:29:26 +08:00
  • 673ebbec1b [Update] Merge with dev ibuler 2019-10-21 15:19:21 +08:00
  • c2f78b1170 [Update] 修改jumpserver,支持url前缀 ibuler 2019-10-21 15:15:47 +08:00
  • 20f8c12576 Merge pull request #3358 from jumpserver/dev BaiJiangJie 2019-10-18 18:52:07 +08:00
  • 1bc6492064 Merge pull request #3359 from jumpserver/dev_fav BaiJiangJie 2019-10-18 18:07:32 +08:00
  • a7ae132b2b [Update] 优化收藏资产功能,不刷新页面的情况下,可以在收藏资产列表取消收藏 BaiJiangJie 2019-10-18 18:06:07 +08:00
  • a978bf990d Merge pull request #3342 from jumpserver/perms_assets_search_bug BaiJiangJie 2019-10-18 16:21:26 +08:00
  • 491f59026c Merge pull request #3356 from jumpserver/dev_tree BaiJiangJie 2019-10-18 15:25:43 +08:00
  • a6531fedb5 [Bugfix] 修复 TreeNode bug BaiJiangJie 2019-10-18 15:23:46 +08:00
  • e5250294b0 Dev export (#3355) BaiJiangJie 2019-10-18 15:12:17 +08:00
  • f3dc9b886b Asset favor (#3352) BaiJiangJie 2019-10-18 15:05:45 +08:00
  • 70664d435f [Update] 修改小问题 jym503558564 2019-10-17 11:59:18 +08:00
  • ee97144a10 [Bugfix] 修复资产授权列表 节点搜索报500错误 jym503558564 2019-10-17 11:03:06 +08:00
  • 9870d3aa85 [Bugfix] 修复判断问题 ibuler 2019-10-16 15:31:48 +08:00
  • c3699889e2 [Update] 修改session支持protocol搜索 ibuler 2019-10-16 15:29:44 +08:00
  • 237d51cff9 [Update] 拆分filter org ibuler 2019-10-16 13:31:42 +08:00
  • ccdb770972 Merge pull request #3344 from jumpserver/dev_ug BaiJiangJie 2019-10-15 17:41:12 +08:00
  • 8fcfcf7ad3 [Update] 更新创建/更新用户组是取消按钮->重置按钮(避免引起歧义) BaiJiangJie 2019-10-15 17:38:48 +08:00
  • 31280a3869 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev ibuler 2019-10-15 16:27:39 +08:00
  • 70a4f137b8 [Update] 添加脚本 ibuler 2019-10-15 16:27:22 +08:00
  • 01ead7c8e1 [Bugfix] 修复资产授权列表搜索 无效的 出现500错误 jym503558564 2019-10-15 12:41:29 +08:00
  • ad3524f942 Merge pull request #3337 from jumpserver/dev_cmds_es BaiJiangJie 2019-10-14 16:02:35 +08:00
  • 1a1f20920d [Bugfix] 修改终端命令类型 MAPPING(elasticsearch -> es) BaiJiangJie 2019-10-14 15:15:06 +08:00
  • b4d164954d [Bugfix] 修复命令记录从 es 中获取失败(原因:时间日期格式不匹配) BaiJiangJie 2019-10-14 11:59:24 +08:00
  • 52d0961519 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev ibuler 2019-10-14 11:37:31 +08:00
  • e093475351 [Update] 修改jms stop ibuler 2019-10-14 11:37:13 +08:00
  • 13822cbf6d Merge pull request #3334 from jumpserver/dev_su_asset BaiJiangJie 2019-10-12 18:14:59 +08:00
  • b732f4e32c [Bugfix] 修改调用系统用户资产 API 时 Connectivity is not JSON serializable 的 Bug BaiJiangJie 2019-10-12 18:00:40 +08:00
  • c0d1bf8ecc Merge pull request #3332 from jumpserver/dev_char BaiJiangJie 2019-10-12 17:42:57 +08:00
  • 1f5cdc3fa4 [Update] 添加翻译: 限制 组织/系统用户名称 中的特殊字符 BaiJiangJie 2019-10-12 17:42:00 +08:00
  • 21b17ca41a [Update] 系统用户 name 限制使用特殊字符 BaiJiangJie 2019-10-12 17:05:49 +08:00
  • 70713af95a [Update] 限制组织名称中使用的特殊字符 BaiJiangJie 2019-10-12 16:51:09 +08:00
  • 2f2b0b28b3 Merge pull request #3325 from jumpserver/dev_assets BaiJiangJie 2019-10-11 11:41:37 +08:00
  • 7574966ccf [Bugfix] 修复组织管理员在资产详情页面不显示(删除/更新)按钮的问题 BaiJiangJie 2019-10-11 11:22:11 +08:00
  • 3986bbf7ac Merge pull request #3323 from jumpserver/dev_nodes BaiJiangJie 2019-10-10 18:06:47 +08:00
  • 4102dc6842 Merge pull request #3324 from jumpserver/dev_ldap BaiJiangJie 2019-10-10 18:05:41 +08:00
  • d1dc3342a2 [Update] 配置项 AUTH_LDAP_USER_LOGIN_ONLY_IN_USERS 添加到 config_example.yml 中 BaiJiangJie 2019-10-10 18:04:31 +08:00
  • dfedfc7e7a [Update] LDAP 登录认证添加配置项:只有在用户列表中的用户会被允许认证 BaiJiangJie 2019-10-10 17:53:22 +08:00
  • 7ff6391801 [Update] 修改删除节点 API 返回的状态码 BaiJiangJie 2019-10-10 16:59:57 +08:00
  • 5f96f8c229 [Update] 优化节点删除 API,添加删除失败原因 BaiJiangJie 2019-10-10 16:18:29 +08:00
  • 7e7583e4fc Merge pull request #3321 from jumpserver/bugfix 老广 2019-10-10 12:50:13 +08:00
  • 74b4ff4993 [Update] 修改celery log ibuler 2019-10-10 12:47:21 +08:00
  • ca50c0a9b3 Merge pull request #3319 from jumpserver/dev_muiltselect BaiJiangJie 2019-10-10 11:27:59 +08:00
  • cea6ea4826 [Update] 更新 select2 js/css 依赖版本(4.0.10):解决多选下拉框自动回跳到顶部的问题 BaiJiangJie 2019-10-10 11:22:09 +08:00
  • 3bd3564b2b Merge pull request #3317 from jumpserver/bugfix BaiJiangJie 2019-10-09 19:13:25 +08:00
  • 9ee9be3339 Merge remote-tracking branch 'origin/bugfix' into bugfix ibuler 2019-10-09 19:10:54 +08:00
  • ce530e417c [Update] 修改cmd filter rules pattern ibuler 2019-10-09 19:10:36 +08:00
  • c8cade622a [Update] 优化 LDAP 导入/搜索 逻辑 BaiJiangJie 2019-10-09 18:36:38 +08:00
  • f65ee12b16 Merge pull request #3316 from jumpserver/dev 1.5.3 BaiJiangJie 2019-10-09 17:32:02 +08:00
  • 230b3edf7b Merge pull request #3315 from jumpserver/dev_bai BaiJiangJie 2019-10-09 17:24:20 +08:00
  • 670e8afe76 [Update] 更新定时测试管理用户可连接性 PERIOD_TASK_ENABLED 判断 BaiJiangJie 2019-10-09 17:23:22 +08:00
  • e52178811c [Update] 修改command显示 ibuler 2019-10-09 16:52:38 +08:00
  • 74ab311d3e [Update] 修改ldap和command ibuler 2019-10-09 16:49:36 +08:00
  • 719bea683a Merge pull request #3313 from jumpserver/dev 老广 2019-10-09 10:50:12 +08:00
  • dc5598f8dc [Update] 修改settings ibuler 2019-10-09 10:43:51 +08:00
  • c6fef20390 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev ibuler 2019-10-08 19:14:43 +08:00
  • 87d5b6c473 [Update] 修改启动脚本 ibuler 2019-10-08 19:14:23 +08:00