Commits · a3683f184ecda499512e7c64838b3ce3a017c8ef · ops / jumpserver

14 Oct, 2016 2 commits
- Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver · a3683f18
  江世峰 authored Oct 14, 2016
```
Merge
```
  a3683f18
- asset:update assets_list by tag · abe09e2a
  江世峰 authored Oct 14, 2016
  
  abe09e2a
13 Oct, 2016 1 commit
- Merge branch 'connect' · 3efad338
  ibuler authored Oct 13, 2016
  
  3efad338
12 Oct, 2016 2 commits
- Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver · 29b3ef70
  ibuler authored Oct 12, 2016
  
  29b3ef70
- asset:update assets_list by tag · 73f5891f
  江世峰 authored Oct 12, 2016
  
  73f5891f
10 Oct, 2016 1 commit
- Add proxy log api for create or update · 081af2f9
  ibuler authored Oct 09, 2016
  
  081af2f9
09 Oct, 2016 4 commits
- Modify some bug · 0c8922e3
  ibuler authored Oct 09, 2016
  
  0c8922e3
- Update README.md · 82610163
  广宏伟 authored Oct 09, 2016
  
  82610163
- Move terminal to a new project · ba82c395
  ibuler authored Oct 09, 2016
  
  ba82c395
- Add audits api · 0954f6d7
  ibuler authored Oct 08, 2016
  
  0954f6d7
08 Oct, 2016 1 commit
- asset:update tag · b99b88a3
  江世峰 authored Oct 08, 2016
  
  b99b88a3
07 Oct, 2016 4 commits
- Update table desgin doc and audit log · 59727656
  ibuler authored Oct 07, 2016
  
  59727656
- Merge branch 'master' of code.simcu.com:jumpserver/jumpserver · 0c611b64
  江世峰 authored Oct 07, 2016
```
merage
```
  0c611b64
- assets:add tag · 2829445f
  江世峰 authored Oct 07, 2016
  
  2829445f
- Record command history · 0cda4e09
  ibuler authored Oct 07, 2016
  
  0cda4e09
02 Oct, 2016 8 commits
- Modify inital data · aa02c211
  ibuler authored Oct 02, 2016
  
  aa02c211
- Add migrations · 6b610549
  ibuler authored Oct 02, 2016
  
  6b610549
- Merge branch 'connect' · 45df5811
  ibuler authored Oct 02, 2016
  
  45df5811
- Merge with master · a04d7725
  ibuler authored Oct 02, 2016
  
  a04d7725
- Rm teminal app · 820d608b
  ibuler authored Oct 02, 2016
  
  820d608b
- Update requirement · b54c973d
  ibuler authored Oct 02, 2016
  
  b54c973d
- Pripare web terminal server · 0234ff02
  ibuler authored Oct 02, 2016
  
  0234ff02
- integrate the user-group list page with its api; · 6856fad0
  xiaokong1937@gmail.com authored Oct 02, 2016
  
  6856fad0
01 Oct, 2016 1 commit
- user bulk import through Excel and close #20 · d40aa49d
  xiaokong1937@gmail.com authored Oct 01, 2016
  
  d40aa49d
30 Sep, 2016 4 commits
- user-group detail: fix #15 · 05e961f2
  xiaokong1937@gmail.com authored Sep 30, 2016
  
  05e961f2
- Merge branch 'master' of code.simcu.com:jumpserver/jumpserver · 474f7e0f
  江世峰 authored Sep 30, 2016
```
merge
```
  474f7e0f
- fix #25 · fd52a85d
  江世峰 authored Sep 30, 2016
  
  fd52a85d
- Debug to find command · d9866e1f
  ibuler authored Sep 29, 2016
  
  d9866e1f
29 Sep, 2016 6 commits
- Use thread replace process · 0d25a8f5
  ibuler authored Sep 29, 2016
  
  0d25a8f5
- Try to fix ssh server close client bug · b4c64991
  ibuler authored Sep 29, 2016
  
  b4c64991
- user-group-detail: user-adding frontend integration · d8143a67
  xiaokong1937@gmail.com authored Sep 29, 2016
  
  d8143a67
- Debug some bug for auth failed and exit · e3c620e1
  ibuler authored Sep 29, 2016
  
  e3c620e1
- Modify ssh server bug for using public key · acf51238
  ibuler authored Sep 29, 2016
  
  acf51238
- user-group-detail: add users support · e7fddf80
  xiaoyu authored Sep 29, 2016
  
  e7fddf80
28 Sep, 2016 4 commits
- user-group detail page: users op · f9b49605
  xiaokong1937@gmail.com authored Sep 28, 2016
  
  f9b49605
- Merge branch 'master' of code.simcu.com:jumpserver/jumpserver · 0dec6471
  江世峰 authored Sep 28, 2016
```
rollback user_list.html
```
  0dec6471
- rollback user_list.html · 3201853c
  江世峰 authored Sep 28, 2016
  
  3201853c
- assets_group_forbug · e83ecb12
  江世峰 authored Sep 28, 2016
  
  e83ecb12
27 Sep, 2016 2 commits
- trivial changes: refactor the jumpserver DataTable api · 2522f0d8
  xiaokong1937@gmail.com authored Sep 27, 2016
  
  2522f0d8
- fix #27 · 70a6ddc8
  xiaokong1937@gmail.com authored Sep 27, 2016
  
  70a6ddc8