github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
4,827 Commits
87 Branches
259 Tags
138 MiB
Commit Graph

4827 Commits (41b73c37014715147cffbba0a9407141af3aeb5f)

Author SHA1 Message Date
BaiJiangJie d3cf2afb51
Merge pull request #3380 from jumpserver/dev_req 
[Update] 更新依赖版本号
 2019-10-24 12:27:04 +08:00
BaiJiangJie 3c5ebeeb20 [Update] 更新依赖版本号 2019-10-24 12:23:39 +08:00
BaiJiangJie 58f564b028
Merge pull request #3379 from jumpserver/dev 
Dev
 2019-10-24 12:22:25 +08:00
BaiJiangJie 8fd65a372e
Merge pull request #3378 from jumpserver/dev_req 
[Update] 更新依赖包版本
 2019-10-24 12:10:49 +08:00
BaiJiangJie f8f1aee997 [Update] 更新依赖包版本 2019-10-24 12:08:48 +08:00
ibuler 9bb7c1adc1 [Update] 更改命令执行超时提示 2019-10-24 10:23:31 +08:00
ibuler d5cb0a2e59 [Update] Merge with dev 2019-10-23 15:25:06 +08:00
BaiJiangJie 7c4dee324f
Merge pull request #3377 from jumpserver/dev 
Dev
 2019-10-23 15:25:04 +08:00
BaiJiangJie 4c1821e42e
Merge pull request #3376 from jumpserver/dev_v 
[Update] 修改版本号（1.5.4）
 2019-10-23 15:23:57 +08:00
BaiJiangJie f31ed0afb8 [Update] 修改版本号（1.5.4） 2019-10-23 15:20:56 +08:00
BaiJiangJie 5e5f3ad383
Merge pull request #3375 from jumpserver/dev 
[Update] Add debug message
 2019-10-23 15:18:35 +08:00
ibuler f802fb645d [Update] Add debug message 2019-10-23 11:01:39 +08:00
老广 93e8c9e534
Merge pull request #3374 from jumpserver/dev 
Dev
 2019-10-23 10:17:45 +08:00
老广 0b405fdefa
Merge pull request #3373 from jumpserver/bugfix 
Bugfix
 2019-10-23 10:17:09 +08:00
ibuler c995050ed7 [Update] 修改ws read celery log file 2019-10-23 10:14:07 +08:00
ibuler 0dbf2ab2e5 [Update] 修改websocket读取日志 2019-10-22 19:45:03 +08:00
老广 22cc8ffbdd
Merge pull request #3370 from jumpserver/bugfix 
Bugfix
 2019-10-22 19:33:01 +08:00
ibuler 6b8b0f4a0b [Update] 修改terminal字体 2019-10-22 19:30:53 +08:00
ibuler b3502a9291 [Update] 修改terminal字体 2019-10-22 19:30:39 +08:00
BaiJiangJie 1c92516fd0
Merge pull request #3369 from jumpserver/dev 
Dev
 2019-10-22 19:11:55 +08:00
BaiJiangJie c3f02dbaab
Merge pull request #3368 from jumpserver/dev_icon 
[Update] 修改icon图片
 2019-10-22 19:11:11 +08:00
jym503558564 214c4d2f75 [Update] 修改icon图片 2019-10-22 19:07:23 +08:00
BaiJiangJie 5a98b61c1e
Merge pull request #3367 from jumpserver/dev 
Dev
 2019-10-22 18:57:39 +08:00
BaiJiangJie 11ae5a4a4a
Merge pull request #3365 from jumpserver/login_log_bugfix 
[Bugfix] 修改导出登录日志的日期选择从开始时间的00:00:00，到结束时间的23:59:59
 2019-10-22 17:43:57 +08:00
BaiJiangJie 5f3583279c [Update] 优化登录日志时间范围 2 2019-10-22 17:42:28 +08:00
BaiJiangJie 950358f5ba [Update] 优化登录日志时间范围 2019-10-22 17:40:55 +08:00
BaiJiangJie 84b3e29db6
Merge pull request #3366 from jumpserver/bugfix 
Bugfix
 2019-10-22 17:30:22 +08:00
ibuler a33d5cc53b [Update] 修改返回asset tree带上组织 2019-10-22 17:21:54 +08:00
jym503558564 3c7fa1b60b [Update] 修改小问题 2019-10-22 16:26:46 +08:00
jym503558564 f4fc757379 [Bugfix] 修改导出登录日志的日期选择从开始时间的00:00:00，到结束时间的23:59:59 2019-10-22 16:17:42 +08:00
ibuler 7cf617c3fc [Update] 修改jms启动脚本，stop时增加超时检测 2019-10-22 16:09:21 +08:00
ibuler 87deb18791 [Update] 修改command 批量执行左侧选择系统用户 2019-10-22 15:53:24 +08:00
ibuler 82a6369568 [Update] 修改term大小 2019-10-22 15:38:49 +08:00
ibuler 3a10fd4160 [Update] 修改查看auth info可以关闭mfa 2019-10-22 12:16:50 +08:00
ibuler a2f8f43321 [Update] 修改查看auth info可以关闭mfa 2019-10-22 11:31:15 +08:00
ibuler 6ebe8e16bd [Update] 修改读取日志时可能解码失败 2019-10-21 19:28:33 +08:00
ibuler 86522627d3 [Update] 优化提交api报错时滚动到，优化table页面某些列宽度 2019-10-21 19:07:35 +08:00
BaiJiangJie 334e3bef0e
Merge pull request #3363 from jumpserver/dev_ug 
[Update] 优化用户组详情，用户选择下拉列表使用异步加载；命令过滤详情绑定到系统用户点击不关闭；
 2019-10-21 18:46:43 +08:00
BaiJiangJie 0930716a54 [Update] 优化用户组详情，用户选择下拉列表使用异步加载；命令过滤详情绑定到系统用户点击不关闭； 2019-10-21 18:45:12 +08:00
ibuler f984acf1b2 [Bugfix] 修复导致favorite 和 empty 同时出现 2019-10-21 17:14:49 +08:00
ibuler 87c7452d19 [Update] 修改email msg 2019-10-21 17:02:16 +08:00
ibuler 792fc3b0f0 [Update] 添加koko访问错误说明 2019-10-21 15:29:26 +08:00
ibuler 673ebbec1b [Update] Merge with dev 2019-10-21 15:19:21 +08:00
ibuler c2f78b1170 [Update] 修改jumpserver,支持url前缀 2019-10-21 15:15:47 +08:00
BaiJiangJie 20f8c12576
Merge pull request #3358 from jumpserver/dev 
Dev
 2019-10-18 18:52:07 +08:00
BaiJiangJie 1bc6492064
Merge pull request #3359 from jumpserver/dev_fav 
[Update] 优化收藏资产功能，不刷新页面的情况下，可以在收藏资产列表取消收藏
 2019-10-18 18:07:32 +08:00
BaiJiangJie a7ae132b2b [Update] 优化收藏资产功能，不刷新页面的情况下，可以在收藏资产列表取消收藏 2019-10-18 18:06:07 +08:00
BaiJiangJie a978bf990d
Merge pull request #3342 from jumpserver/perms_assets_search_bug 
[Bugfix] 修复资产授权列表搜索 【node:node_name】/【node_id:node_id】/【is_valid:false】 出现500错误
 2019-10-18 16:21:26 +08:00
BaiJiangJie 491f59026c
Merge pull request #3356 from jumpserver/dev_tree 
[Bugfix] 修复 TreeNode bug
 2019-10-18 15:25:43 +08:00
BaiJiangJie a6531fedb5 [Bugfix] 修复 TreeNode bug 2019-10-18 15:23:46 +08:00