Commits · 067046df4dddf39cf5c0e48778d482b40b4c00ae · ops / luna

02 Feb, 2018 4 commits
- Merged in test (pull request #53) · 067046df
  zheng liu authored Feb 02, 2018
```
Test
```
  067046df
- Merged in dev (pull request #52) · a9e809b1
  zheng liu authored Feb 02, 2018
```
Dev
```
  a9e809b1
- feat: use material2 and unuse the layer-layui · 83ef09fb
  liuzheng712 authored Feb 02, 2018
  
  83ef09fb
- Merged in master (pull request #51) · 3c1a5c68
  zheng liu authored Feb 02, 2018
```
Master
```
  3c1a5c68
01 Feb, 2018 5 commits
- feat: udpate · 8c1e2a52
  liuzheng712 authored Feb 01, 2018
  
  8c1e2a52
- Merged in test (pull request #50) · a4da2f50
  zheng liu authored Feb 01, 2018
```
Test
```
  a4da2f50
- Merged in dev (pull request #49) · 12f3e829
  zheng liu authored Feb 01, 2018
```
Dev
```
  12f3e829
- feat: term token page · 2e1bfb6d
  liuzheng712 authored Feb 01, 2018
  
  2e1bfb6d
- feat: update · 1fc59d44
  liuzheng712 authored Feb 01, 2018
  
  1fc59d44
31 Jan, 2018 1 commit
- feat: update · d9cb7e13
  liuzheng712 authored Jan 31, 2018
  
  d9cb7e13
26 Jan, 2018 30 commits
- Merge branch 'dev' · 0c61a4ed
  liuzheng712 authored Jan 26, 2018
  
  0c61a4ed
- Merge branch 'master' of github.com:jumpserver/luna into dev · 524cde80
  liuzheng712 authored Jan 26, 2018
  
  524cde80
- feat: update · d9da0fed
  liuzheng712 authored Jan 26, 2018
  
  d9da0fed
- feat: merge · 7105c3b6
  liuzheng712 authored Jan 26, 2018
  
  7105c3b6
- Merge branch 'dev' of github.com:jumpserver/luna into dev · 06e0c6a3
  liuzheng712 authored Jan 26, 2018
  
  06e0c6a3
- feat: a lot fix · f7998dbb
  liuzheng712 authored Jan 26, 2018
  
  f7998dbb
- feat: lot fix · b04b3c56
  liuzheng712 authored Jan 26, 2018
  
  b04b3c56
- Merge branch 'dev' · e6622e41
  liuzheng712 authored Jan 26, 2018
  
  e6622e41
- fix: update · 959d9fab
  liuzheng712 authored Jan 26, 2018
  
  959d9fab
- Merge branch 'dev' · ca46765d
  liuzheng712 authored Jan 26, 2018
  
  ca46765d
- feat: · 3245beb1
  liuzheng712 authored Jan 26, 2018
```
update
```
  3245beb1
- Merge branch 'dev' · de243698
  liuzheng712 authored Jan 26, 2018
  
  de243698
- feat: update · 18b812ea
  liuzheng712 authored Jan 26, 2018
  
  18b812ea
- Merge branch 'dev' · eb5d3d10
  liuzheng712 authored Jan 26, 2018
  
  eb5d3d10
- feat: update · a7d80df7
  liuzheng712 authored Jan 26, 2018
  
  a7d80df7
- Merge branch 'dev' · 0f20999c
  liuzheng712 authored Jan 26, 2018
  
  0f20999c
- fix: · 92bc5d25
  liuzheng712 authored Jan 26, 2018
  
  92bc5d25
- Merge branch 'dev' · 4aabcd4b
  liuzheng712 authored Jan 26, 2018
  
  4aabcd4b
- feat: debug · f9f59c18
  liuzheng712 authored Jan 26, 2018
  
  f9f59c18
- Merge branch 'dev' · 6f8a9b88
  liuzheng712 authored Jan 26, 2018
  
  6f8a9b88
- fix: base64 · bce0d297
  liuzheng712 authored Jan 26, 2018
  
  bce0d297
- feat: set title · 50241b78
  liuzheng712 authored Jan 26, 2018
  
  50241b78
- Merge branch 'dev' · 17774cce
  liuzheng712 authored Jan 26, 2018
  
  17774cce
- fix: fix the form · 7d8b5914
  liuzheng712 authored Jan 26, 2018
  
  7d8b5914
- Merge branch 'dev' · 75e8463a
  liuzheng712 authored Jan 26, 2018
  
  75e8463a
- fix: update · 34040570
  liuzheng712 authored Jan 26, 2018
  
  34040570
- Merge branch 'dev' · 88a86b58
  liuzheng712 authored Jan 26, 2018
  
  88a86b58
- fix: phone null bug · 63d9bbbf
  liuzheng712 authored Jan 26, 2018
  
  63d9bbbf
- Merge branch 'dev' · 67a0f132
  liuzheng712 authored Jan 26, 2018
  
  67a0f132
- fix: · d785d436
  liuzheng712 authored Jan 26, 2018
```
update
```
  d785d436