Commits · 5ad8b3cc701d17a5ccadccc0aa7edb2acb8c67e5 · ops / jumpserver

12 Apr, 2018 2 commits
- Merge pull request #1191 from jumpserver/dev · 5ad8b3cc
  老广 authored Apr 12, 2018
```
[Update] 更改版本号
```
  5ad8b3cc
- [Update] 更改版本号 · 7d14e1f2
  ibuler authored Apr 12, 2018
  
  7d14e1f2
11 Apr, 2018 9 commits
- Merge pull request #1187 from jumpserver/dev · 819f8f46
  老广 authored Apr 11, 2018
```
[Bugfix] 修复一个脚本的bug
```
  819f8f46
- [Update] · a31b7a88
  ibuler authored Apr 11, 2018
  
  a31b7a88
- Merge pull request #1185 from jumpserver/dev · 24bdaeca
  老广 authored Apr 11, 2018
```
授权规则优化，支持细颗粒授权
```
  24bdaeca
- [Update] 修改授权规则详情列表页面 · 8b3b517b
  ibuler authored Apr 11, 2018
  
  8b3b517b
- [Update] 修改资产api获取的bug · 7fc2ef00
  ibuler authored Apr 11, 2018
  
  7fc2ef00
- [Update] 添加迁移脚本 · cbd6c3ee
  ibuler authored Apr 11, 2018
  
  cbd6c3ee
- [Update] 修改bug · 3835adaf
  ibuler authored Apr 11, 2018
  
  3835adaf
- [Update] 修改Perms · bbaa35c7
  ibuler authored Apr 11, 2018
  
  bbaa35c7
- Merge branch 'dev' into perms · 0fa82878
  ibuler authored Apr 11, 2018
  
  0fa82878
10 Apr, 2018 6 commits
- [Update] 修改用户Opt · 78f4e5a8
  ibuler authored Apr 10, 2018
  
  78f4e5a8
- Merge remote-tracking branch 'github/dev' into dev · 3193c554
  ibuler authored Apr 10, 2018
  
  3193c554
- [Update] 修改用户Opt · ed71e7d2
  ibuler authored Apr 10, 2018
  
  ed71e7d2
- [Update] 修复bug · 33c29956
  ibuler authored Apr 10, 2018
  
  33c29956
- [Update] 修改Permr认证 · 84634eb8
  ibuler authored Apr 10, 2018
  
  84634eb8
- [Update] 修改用户view的api · a4ff2181
  ibuler authored Apr 10, 2018
  
  a4ff2181
08 Apr, 2018 2 commits
- [Update] 修改api和view · fffa0def
  ibuler authored Apr 08, 2018
  
  fffa0def
- [Update] 修改授权 · d0ede246
  ibuler authored Apr 07, 2018
  
  d0ede246
06 Apr, 2018 6 commits
- Merge pull request #1162 from BaiJiangJie/dev · b8b78ffe
  BaiJiangJie authored Apr 06, 2018
```
创建用户发送邮件
```
  b8b78ffe
- Merge pull request #1175 from jumpserver/dev · d2d10b59
  老广 authored Apr 06, 2018
```
支持sftp
```
  d2d10b59
- [Update] 修改文案 · cb8e59ed
  ibuler authored Apr 06, 2018
  
  cb8e59ed
- [update] 添加Migrations · 1c0d783e
  ibuler authored Apr 06, 2018
  
  1c0d783e
- Merge remote-tracking branch 'github/dev' into dev · 4fa72400
  ibuler authored Apr 06, 2018
  
  4fa72400
- [Update] 添加审计模块 · 37c0062f
  ibuler authored Apr 06, 2018
  
  37c0062f
04 Apr, 2018 5 commits
- 修复资产列表导出问题 · 8504c3d2
  BaiJiangjie authored Apr 04, 2018
  
  8504c3d2
- Merge pull request #1171 from jumpserver/dev · 2d10e130
  老广 authored Apr 04, 2018
```
Dev
```
  2d10e130
- [Bugfix] 修复小bug · 1d7ba3e2
  ibuler authored Apr 04, 2018
  
  1d7ba3e2
- [Update] 修改小bug · d966e22c
  ibuler authored Apr 04, 2018
  
  d966e22c
- [Update] 修改api权限 · 6a88fd2d
  ibuler authored Apr 04, 2018
  
  6a88fd2d
03 Apr, 2018 7 commits
- 创建用户发送邮件 · b63999f3
  BaiJiangjie authored Apr 03, 2018
  
  b63999f3
- Merge pull request #1158 from jumpserver/dev · 82d06351
  老广 authored Apr 03, 2018
```
bugfix for celery log path
```
  82d06351
- Merge branch 'ansible' into dev · aa8bece7
  ibuler authored Apr 03, 2018
  
  aa8bece7
- Merge pull request #1156 from jumpserver/dev · 241bdff7
  老广 authored Apr 03, 2018
```
Dev
```
  241bdff7
- [Update] 更新内容 · 168335a3
  ibuler authored Apr 03, 2018
  
  168335a3
- Merge remote-tracking branch 'github/dev' into dev · 121726b7
  ibuler authored Apr 03, 2018
  
  121726b7
- [Bugfix] 修复 ApiUpdateAttr的bug · 0b812a03
  ibuler authored Apr 03, 2018
  
  0b812a03
02 Apr, 2018 3 commits
- [Bugfix] 修复没有Log path引起的bug · 79ae6efa
  ibuler authored Apr 02, 2018
  
  79ae6efa
- Merge pull request #1154 from BaiJiangJie/master · d2f108ee
  老广 authored Apr 02, 2018
```
终端管理用户显示，资产导入IP字段空格，资产导入domain字段保存
```
  d2f108ee
- Merge pull request #1 from BaiJiangJie/dev · c48beb10
  BaiJiangJie authored Apr 02, 2018
```
终端管理用户，资产列表IP字段，domain保存对象
```
  c48beb10