Commits · 6856fad0c025f7f5049412a3b32160b03e1bc421 · ops / jumpserver

02 Oct, 2016 1 commit
- 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 3 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
29 Sep, 2016 2 commits
- user-group-detail: user-adding frontend integration · d8143a67
  xiaokong1937@gmail.com authored Sep 29, 2016
  
  d8143a67
- 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
26 Sep, 2016 4 commits
- add user-list-delete support for user-group detail page · 49f00760
  xiaokong1937@gmail.com authored Sep 26, 2016
  
  49f00760
- user list groups bulk update · 74cdd2d0
  xiaokong1937@gmail.com authored Sep 26, 2016
  
  74cdd2d0
- user list bulk update modal · 15dcc760
  xiaoyu authored Sep 26, 2016
  
  15dcc760
- fix #26 · d2197d99
  xiaoyu authored Sep 26, 2016
  
  d2197d99
24 Sep, 2016 11 commits
- add __init__.py · 7ab47916
  ibuler authored Sep 24, 2016
  
  7ab47916
- Update gitignore · 283c53fd
  ibuler authored Sep 24, 2016
  
  283c53fd
- update · c5c11864
  ibuler authored Sep 24, 2016
  
  c5c11864
- update .gitignore · da56310d
  ibuler authored Sep 24, 2016
  
  da56310d
- update .gitignore · 7935c003
  ibuler authored Sep 24, 2016
  
  7935c003
- Update ignore · 1620f6a3
  ibuler authored Sep 24, 2016
  
  1620f6a3
- update .gitignore · 4925f322
  ibuler authored Sep 24, 2016
  
  4925f322
- Modify ignore · c158edb5
  ibuler authored Sep 24, 2016
  
  c158edb5
- Modify ignore · 88bb620a
  ibuler authored Sep 24, 2016
  
  88bb620a
- Modify git ignore · a65d5269
  ibuler authored Sep 24, 2016
  
  a65d5269
- Add requirement · 1f3d7634
  ibuler authored Sep 24, 2016
  
  1f3d7634
23 Sep, 2016 3 commits
- Merge branch 'master' of code.simcu.com:jumpserver/jumpserver · 184ac728
  江世峰 authored Sep 23, 2016
```
update:add_assets-group
```
  184ac728
- update add_assets-group · 5bf414ff
  江世峰 authored Sep 23, 2016
  
  5bf414ff
- user bulk delete view · 22163173
  xiaoyu authored Sep 23, 2016
  
  22163173
22 Sep, 2016 3 commits
- Merge branch 'master' of code.simcu.com:jumpserver/jumpserver · 18341717
  江世峰 authored Sep 22, 2016
```
"assets-group"
```
  18341717
- update assets-group · d2e98940
  江世峰 authored Sep 22, 2016
  
  d2e98940
- user list page bulk action · af713672
  xiaoyu authored Sep 22, 2016
  
  af713672
21 Sep, 2016 2 commits
- temp: deactive test · 515406c0
  xiaoyu authored Sep 21, 2016
  
  515406c0
- temp · 61d1d9ec
  xiaoyu authored Sep 21, 2016
  
  61d1d9ec
20 Sep, 2016 3 commits
- Finish some bug · 22089282
  ibuler authored Sep 19, 2016
  
  22089282
- Merge with asset · ce5950ca
  ibuler authored Sep 19, 2016
  
  ce5950ca
- finish asset · 24e31a69
  ibuler authored Sep 19, 2016
  
  24e31a69
19 Sep, 2016 1 commit
- user-group edit implement · 65461a09
  xiaokong1937@gmail.com authored Sep 19, 2016
  
  65461a09