Commits · 283b1c1d64bee3a55dfe1cc06d7baa2760556a27 · ops / jumpserver

06 Jun, 2018 9 commits
- Merge pull request #1403 from jumpserver/dev · 283b1c1d
  老广 authored Jun 06, 2018
```
[Update] 修改清理用户组脚本
```
  283b1c1d
- [Update] 修改清理用户组脚本 · c8c0479c
  ibuler authored Jun 06, 2018
  
  c8c0479c
- Merge pull request #1401 from jumpserver/dev · 2a30204c
  老广 authored Jun 06, 2018
```
Dev
```
  2a30204c
- Merge remote-tracking branch 'github/dev' into dev · 30afcecf
  ibuler authored Jun 06, 2018
  
  30afcecf
- [Update] 删除user group继承的抽象类 · 80d11bba
  ibuler authored Jun 06, 2018
  
  80d11bba
- [Bugfix] 暂时还不能删除Tree这个类 · 58e36b5f
  ibuler authored Jun 06, 2018
  
  58e36b5f
- [Bugfix] 修复权限查看引起的bug · 2c413e8d
  ibuler authored Jun 06, 2018
  
  2c413e8d
- Merge pull request #1400 from jokimina/dev_for_pr · 17de014e
  老广 authored Jun 06, 2018
```
remove useless image
```
  17de014e
- remove useless image · 6b2a38c7
  xiaodong authored Jun 04, 2018
  
  6b2a38c7
05 Jun, 2018 1 commit
- Merge pull request #1395 from jumpserver/dev · 99c4875d
  老广 authored Jun 05, 2018
```
Dev
```
  99c4875d
01 Jun, 2018 4 commits
- [Update] 修改permisstion util · 482d1bb2
  ibuler authored Jun 01, 2018
  
  482d1bb2
- Merge branch 'dev' into perm_tree · e7c7c3a7
  ibuler authored Jun 01, 2018
  
  e7c7c3a7
- Merge remote-tracking branch 'github/dev' into dev · 54efc887
  ibuler authored Jun 01, 2018
  
  54efc887
- [Update] 修改一些方法 · a9d15381
  ibuler authored Jun 01, 2018
  
  a9d15381
31 May, 2018 3 commits
- [Update] 更新api和model方法 · f8ff223f
  ibuler authored May 31, 2018
  
  f8ff223f
- Merge pull request #1371 from jumpserver/fix_asset_count · a3f1622a
  老广 authored May 31, 2018
```
[Update] 修改资产树节点(数量)总显示此节点以及子孙节点下的所有资产总数
```
  a3f1622a
- Merge pull request #1377 from wojiushixiaobai/dev · 0021f2e5
  老广 authored May 31, 2018
```
[Update]更新自动升级脚本
```
  0021f2e5
30 May, 2018 2 commits
- 更新升级文档 · dbcad472
  wojiushixiaobai authored May 30, 2018
  
  dbcad472
- 修改脚本 · 6c384b49
  wojiushixiaobai authored May 24, 2018
  
  6c384b49
29 May, 2018 11 commits
- Merge branch 'dev' of github.com:jumpserver/jumpserver into fix_asset_count_dev · e9d0104a
  BaiJiangJie authored May 29, 2018
  
  e9d0104a
- [Update] 合并Node的parent.setter方法，修改node_fake的parent逻辑 · 7c694c68
  BaiJiangJie authored May 29, 2018
  
  7c694c68
- [Bugfix] 解决发送邮件重启的问题 · 69e5ab43
  ibuler authored May 29, 2018
  
  69e5ab43
- [Update] 优化asset api, 获取时增加prefetch · 757a31a5
  ibuler authored May 29, 2018
  
  757a31a5
- [Update] 修改资产树节点(数量)总显示此节点下的资产总数 · 5b53cfb4
  BaiJiangJie authored May 29, 2018
  
  5b53cfb4
- Merge remote-tracking branch 'github/dev' into dev · b0710c42
  ibuler authored May 29, 2018
  
  b0710c42
- Merge pull request #1370 from jumpserver/fix_asset_count · d9d82cea
  老广 authored May 29, 2018
```
[Update] 修改资产树和资产列表数量显示(游离资产)
```
  d9d82cea
- Merge pull request #1369 from gengkeye/master · 4f521e5a
  老广 authored May 29, 2018
```
录像回放API BUG： SessionReplayViewSet
```
  4f521e5a
- [Update] 修改资产树和资产列表数量显示(游离资产) · 3a297302
  BaiJiangJie authored May 29, 2018
  
  3a297302
- #1368 · 4f28f854
  oldseven authored May 29, 2018
  
  4f28f854
- Merge branch 'master' of https://github.com/jumpserver/jumpserver · a1905ecf
  oldseven authored May 29, 2018
```
Conflicts:
	apps/terminal/api.py
```
  a1905ecf
28 May, 2018 6 commits
- [Bugfix] 修复网关测试连接需要ssh信任key的问题 · 47397d23
  ibuler authored May 28, 2018
  
  47397d23
- [Update] 优化代码 · 7b57d24d
  ibuler authored May 28, 2018
  
  7b57d24d
- Merge pull request #1366 from jumpserver/dev · f2216274
  老广 authored May 28, 2018
```
Dev
```
  f2216274
- Merge branch 'large' into dev · ffabef00
  ibuler authored May 28, 2018
  
  ffabef00
- [Update] 修改permistion utils优化返回的属性 · 0b4df783
  ibuler authored May 28, 2018
  
  0b4df783
- Merge pull request #1365 from jumpserver/dev · 7987056b
  老广 authored May 28, 2018
```
Dev修复
```
  7987056b
26 May, 2018 1 commit
- [Update] 修改用户组详情显示授权资产的bug · 0bc86543
  ibuler authored May 26, 2018
  
  0bc86543
25 May, 2018 3 commits
- [Bugfix] 修复右击位置不对的bug · fc2a4462
  ibuler authored May 25, 2018
  
  fc2a4462
- [Update] 发送邮件增加用户名显示 · 9b4b9e69
  ibuler authored May 25, 2018
  
  9b4b9e69
- Merge pull request #1362 from jumpserver/dev · 62c114d9
  老广 authored May 25, 2018
```
修改树形结构
```
  62c114d9