github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
4,538 Commits
69 Branches
249 Tags
112 MiB
Commit Graph

4538 Commits (c5438fd65d8ce664c296e0cdbda6e6c30f81b63f)

Author SHA1 Message Date
BaiJiangJie f65ee12b16
Merge pull request #3316 from jumpserver/dev 
Dev
 2019-10-09 17:32:02 +08:00
BaiJiangJie 230b3edf7b
Merge pull request #3315 from jumpserver/dev_bai 
[Update] 更新定时测试管理用户可连接性 PERIOD_TASK_ENABLED 判断
 2019-10-09 17:24:20 +08:00
BaiJiangJie 670e8afe76 [Update] 更新定时测试管理用户可连接性 PERIOD_TASK_ENABLED 判断 2019-10-09 17:23:22 +08:00
ibuler e52178811c [Update] 修改command显示 2019-10-09 16:52:38 +08:00
ibuler 74ab311d3e [Update] 修改ldap和command 2019-10-09 16:49:36 +08:00
老广 719bea683a
Merge pull request #3313 from jumpserver/dev 
Dev
 2019-10-09 10:50:12 +08:00
ibuler dc5598f8dc [Update] 修改settings 2019-10-09 10:43:51 +08:00
ibuler c6fef20390 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2019-10-08 19:14:43 +08:00
ibuler 87d5b6c473 [Update] 修改启动脚本 2019-10-08 19:14:23 +08:00
ibuler 6b377ec5ef [Update] 修改启动脚本 2019-10-08 18:17:48 +08:00
BaiJiangJie aebb98189c
Merge pull request #3311 from jumpserver/dev_email 
[Update] 邮件设置添加测试邮件收件人配置项
 2019-10-08 17:27:49 +08:00
BaiJiangJie c9ca81e80f [Update] 邮件设置添加测试邮件收件人配置项 2019-10-08 17:14:33 +08:00
BaiJiangJie 90ec6a2962 [Bugfix] 修复创建资产节点的Bug (#3308) 2019-10-08 11:57:22 +08:00
BaiJiangJie 7502a372b5
Merge pull request #3299 from jumpserver/master_readme 
[Update] 删除 README 访问量统计图标信息
 2019-09-29 12:15:19 +08:00
BaiJiangJie d366b711da [Update] 删除 README 访问量统计图标信息 2019-09-29 12:14:11 +08:00
BaiJiangJie 16d2b0f1f3
Merge pull request #3298 from jumpserver/dev_readme 
[Update] 删除 README 访问量统计图标信息
 2019-09-29 12:13:03 +08:00
BaiJiangJie 87e485bfe2 [Update] 删除 README 访问量统计图标信息 2019-09-29 12:11:52 +08:00
BaiJiangJie 2f48595cd8
Merge pull request #3295 from jumpserver/dev_ldap_sync_timing 
[Feature] LDAP/AD 添加定时同步任务
 2019-09-27 18:31:40 +08:00
BaiJiangJie fa1a167f8e [Feature] 添加同步 LDAP/AD 用户的定时任务3 2019-09-27 18:30:13 +08:00
BaiJiangJie 8b7c5b1545 [Feature] 添加同步 LDAP/AD 用户的定时任务2（添加同步参数配置项） 2019-09-27 18:19:19 +08:00
ibuler 44f8b978f9 [Update] 添加failover ws 2019-09-27 17:48:54 +08:00
BaiJiangJie 8081a864da Merge branch 'dev' into dev_ldap_sync_timing 2019-09-27 16:56:52 +08:00
BaiJiangJie 674731f7d9
Merge pull request #3294 from jumpserver/dev 
Dev
 2019-09-27 16:25:58 +08:00
ibuler 1a82b8586d [Update] 修改 access key文档地址引用 2019-09-27 15:40:56 +08:00
BaiJiangJie 892e0562b7
Merge pull request #3293 from jumpserver/bugfix 
[Update] 表单中用户使用异步
 2019-09-27 14:38:51 +08:00
ibuler 9e12f3cd17 [Update] 表单中用户使用异步 2019-09-27 14:18:51 +08:00
BaiJiangJie 4b7cd79682 [Feature] 添加同步 LDAP/AD 用户的定时任务1 2019-09-27 14:04:10 +08:00
ibuler ed5b2f8bf8 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2019-09-27 10:36:25 +08:00
ibuler d85c893e3a [update] 修改默认监听的端口 2019-09-27 10:36:06 +08:00
ibuler 2c46707c2b [Update] 修改websocket监听端口 2019-09-27 10:20:20 +08:00
BaiJiangJie 2ff295e3b2
Merge pull request #3292 from jumpserver/dev_bai 
[Update] LDAP 搜索添加分页配置
 2019-09-26 19:23:12 +08:00
ibuler c96d165d3f Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2019-09-26 19:22:32 +08:00
老广 cff009e758
Support ws (#3291) 
* [Update] add ws support

* [Update] 修改log使用websocket

* [Update] 修复 资产用户 右侧动作菜单，字体颜色

* [Update] 修改Dockerfile

* [Bugfix] 修复settings中WSG_APPLICATION
 2019-09-26 19:22:17 +08:00
BaiJiangJie e3c68071b9 [Update] Merge local branch dev to dev_bai 2019-09-26 19:21:15 +08:00
BaiJiangJie ffc8ddd92e
Merge pull request #3289 from jumpserver/v52_ldap_page 
V52 LDAP Page
 2019-09-26 19:15:28 +08:00
BaiJiangJie 587e3fdd74 [Update] LDAP 搜索分页配置默认值修改为1000 2019-09-26 19:02:26 +08:00
BaiJiangJie e4ecb19e38 [Update] LDAP 测试连接性也使用分页配置 2019-09-26 18:58:39 +08:00
BaiJiangJie 25fcbf37c3 [Update] LDAP 导入搜索添加分页配置 2019-09-26 18:55:20 +08:00
ibuler 408b27c561 [Update] Add krb-devel 2019-09-26 16:35:56 +08:00
ibuler e35ba52236 [Update] 修改jms-storage依赖版本 2019-09-26 15:50:41 +08:00
ibuler b75c525df7 [Update] 添加到 gcc到依赖，避免忘记安装 2019-09-26 15:42:46 +08:00
ibuler 77682611c1 [Update] 添加到wget gcc到依赖，避免忘记安装 2019-09-26 15:42:13 +08:00
ibuler 865cc30d16 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2019-09-26 15:09:21 +08:00
老广 c75fd3c108
Bugfix (#3286) 
* [Update] 用户资产页面链接是 新窗口打开

* [Bugfix] 修复切换组织时， refer为空导致的bug

* [Update] 修复执行命令时报错

* [Bugfix] 修复用户树节点资产数量不对的问题

* [Update] 修改初始化tree
 2019-09-26 15:09:10 +08:00
老广 8387c8dbe4
Merge pull request #3285 from jumpserver/dev 
Bugfix (#3284)
 2019-09-26 10:33:15 +08:00
ibuler 4b322fe9f6 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2019-09-26 10:32:49 +08:00
老广 f87db2f4fc
Bugfix (#3284) 
* [Update] 用户资产页面链接是 新窗口打开

* [Bugfix] 修复切换组织时， refer为空导致的bug

* [Update] 修复执行命令时报错
 2019-09-26 10:32:39 +08:00
ibuler 78aba7ae87 [Update] 用户资产页面链接是 新窗口打开 2019-09-25 18:08:58 +08:00
老广 91f64eccda
Merge pull request #3283 from jumpserver/dev 
Dev
 2019-09-25 17:23:00 +08:00
八千流 3c12c33911 [Update] 修改当仅是当前组织审计员时，隐藏终断会话按钮 (#3275) 
* [Update] 修改会话列表中终断按钮，批量终断，SessionViewSet 的权限控制
 2019-09-25 16:58:40 +08:00