Commits · 967491fba5306356f91d7e136248be40eb5a2709 · ops / jumpserver

19 Apr, 2018 13 commits
- Merge pull request #1220 from jumpserver/dev · 967491fb
  老广 authored Apr 19, 2018
```
[Update] 修改用户详情，自己更改自己otp，提示小写
```
  967491fb
- [Update] 修改用户详情，自己更改自己otp，提示小写 · 9ac7f26c
  ibuler authored Apr 19, 2018
  
  9ac7f26c
- Merge pull request #1219 from jumpserver/dev · 910f3cdd
  老广 authored Apr 19, 2018
```
[Bugfix] 修复用户登录缓存设置问题
```
  910f3cdd
- [Bugfix] 修复用户登录缓存设置问题 · f73fe1f3
  BaiJiangjie authored Apr 19, 2018
  
  f73fe1f3
- Merge pull request #1217 from jumpserver/dev · 28acc6cc
  老广 authored Apr 19, 2018
```
[Bugfix] 修复解密None的bug
```
  28acc6cc
- [Bugfix] 修复解密None的bug · 763cf0d9
  ibuler authored Apr 19, 2018
  
  763cf0d9
- Merge pull request #1214 from jumpserver/dev · 611289a5
  老广 authored Apr 19, 2018
```
支持二次认证
```
  611289a5
- Merge remote-tracking branch 'github/dev' into dev · 95a8bf09
  ibuler authored Apr 19, 2018
  
  95a8bf09
- [Bugfix] 修复生成system user的问题 · 947f7d20
  ibuler authored Apr 19, 2018
  
  947f7d20
- [Update] 添加OTP认证功能 · 12c8cf6b
  BaiJiangjie authored Apr 19, 2018
  
  12c8cf6b
- [Update] 添加OTP认证功能 · 33bc73ab
  BaiJiangjie authored Apr 19, 2018
  
  33bc73ab
- Merge pull request #1213 from jumpserver/dev · 53c532a6
  老广 authored Apr 19, 2018
```
更新资产选择
```
  53c532a6
- [Bugfix] 修复授权详情中选择用户或资产的bug · 035dd16b
  ibuler authored Apr 19, 2018
  
  035dd16b
18 Apr, 2018 3 commits
- [Merge] with dev · f450accb
  BaiJiangjie authored Apr 18, 2018
  
  f450accb
- [Feature] 支持otp · 0bbfc743
  BaiJiangjie authored Apr 18, 2018
  
  0bbfc743
- [Update] 修改users otp secret key · 48e87857
  ibuler authored Apr 18, 2018
  
  48e87857
17 Apr, 2018 1 commit
- [Bugfix] 去掉gateway name连接 · b90d3306
  ibuler authored Apr 17, 2018
  
  b90d3306
16 Apr, 2018 3 commits
- Merge remote-tracking branch 'github/master' into dev · 7f7d634c
  ibuler authored Apr 16, 2018
  
  7f7d634c
- Merge pull request #1204 from jumpserver/bugfix_user_assets · 45b13abe
  老广 authored Apr 16, 2018
```
[Bugfix] 修复用户看不到我的资产的bug
```
  45b13abe
- [Bugfix] 修复用户看不到我的资产的bug · 72cd7a3b
  ibuler authored Apr 16, 2018
  
  72cd7a3b
14 Apr, 2018 1 commit
- [Bugfix] 修改授权详情快速Node更改失效的bug · 3ccd5468
  ibuler authored Apr 14, 2018
  
  3ccd5468
13 Apr, 2018 2 commits
- [Update] 修改资产获取select · 071d14c6
  ibuler authored Apr 13, 2018
  
  071d14c6
- [Update] 更新节点移动交互 · 823e8794
  ibuler authored Apr 13, 2018
  
  823e8794
12 Apr, 2018 11 commits
- [Update] 更新资产导入 · 739932b0
  ibuler authored Apr 12, 2018
  
  739932b0
- [Bugfix] 修复导入资产时url地址问题 · 24f144fd
  ibuler authored Apr 12, 2018
  
  24f144fd
- [Update] 更新api · 96780039
  ibuler authored Apr 12, 2018
  
  96780039
- Merge pull request #1197 from jumpserver/dev · 3ccb6637
  老广 authored Apr 12, 2018
```
[Update] 更新迁移脚本
```
  3ccb6637
- [Update] 更新迁移脚本 · 8dfdefd4
  ibuler authored Apr 12, 2018
  
  8dfdefd4
- Merge pull request #1194 from jumpserver/dev · ab2c58b6
  老广 authored Apr 12, 2018
```
[Bugfix] 修复资产重复的bug
```
  ab2c58b6
- [Bugfix] 修复资产重复的bug · ee4f5a81
  ibuler authored Apr 12, 2018
  
  ee4f5a81
- Merge pull request #1193 from jumpserver/dev · 084a76b2
  老广 authored Apr 12, 2018
```
更改表结构
```
  084a76b2
- 更改表截稿 · 2398e9ac
  ibuler authored Apr 12, 2018
  
  2398e9ac
- 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 6 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