Commits · c7192924466e083776f3d2212871d9a294d0cdc4 · ops / coco

01 Mar, 2018 1 commit
- [Bugfix] 修复退出资产直接退出系统的bug · c7192924
  ibuler authored Mar 01, 2018
  
  c7192924
27 Feb, 2018 5 commits
- Merge branch 'dev' into test · 3261f0dc
  ibuler authored Feb 27, 2018
  
  3261f0dc
- [Update] 文案改为中文，并且禁止登陆windows的机器 · e6e1a489
  ibuler authored Feb 27, 2018
  
  e6e1a489
- Merge branch 'dev' into test · 900a61be
  ibuler authored Feb 27, 2018
  
  900a61be
- [Update] 修改一处小bug · 24da12cc
  ibuler authored Feb 27, 2018
  
  24da12cc
- [Bugfix] 修改获取recorder配置的api · 66f4e83c
  ibuler authored Feb 27, 2018
  
  66f4e83c
26 Feb, 2018 1 commit
- Merge branch 'dev' into test · d59cbf38
  ibuler authored Feb 26, 2018
  
  d59cbf38
25 Feb, 2018 6 commits
- Merge branch 'dev' of bitbucket.org:jumpserver/coco into dev · 680816ab
  ibuler authored Feb 25, 2018
  
  680816ab
- [update] 修改requirements · 39bb800b
  ibuler authored Feb 25, 2018
  
  39bb800b
- [Update] 修改登录成功后api调用 · fc75032e
  ibuler authored Feb 25, 2018
  
  fc75032e
- Merge branch 'dev' into test · ddf5360c
  ibuler authored Feb 25, 2018
  
  ddf5360c
- [Update] 修改requirements · deb1d21a
  ibuler authored Feb 25, 2018
  
  deb1d21a
- [Update] 修改文案 · 2be1a774
  ibuler authored Feb 25, 2018
  
  2be1a774
08 Feb, 2018 2 commits
- Merge branch 'dev' of bitbucket.org:jumpserver/coco into dev · 2536cf8c
  liuzheng712 authored Feb 08, 2018
  
  2536cf8c
- feat: s3 with access_key and secret_key and bucket · 0848852e
  liuzheng712 authored Feb 08, 2018
  
  0848852e
06 Feb, 2018 7 commits
- Merge branch 'dev' into test · 35d8896f
  ibuler authored Feb 06, 2018
  
  35d8896f
- [Update] 修改requirements · 13f3846b
  ibuler authored Feb 06, 2018
  
  13f3846b
- Merge branch 'dev' into test · 9a376b5c
  ibuler authored Feb 06, 2018
  
  9a376b5c
- [Bugfix] 单页面token登陆bug修复 · aa7fba82
  ibuler authored Feb 06, 2018
  
  aa7fba82
- Merge remote-tracking branch 'origin/test' into test · c5724107
  ibuler authored Feb 06, 2018
  
  c5724107
- Merge branch 'dev' into test · c6ad5fa9
  ibuler authored Feb 06, 2018
  
  c6ad5fa9
- [Bugfix] 单页面token登陆bug修复 · dffeadd5
  ibuler authored Feb 06, 2018
  
  dffeadd5
05 Feb, 2018 1 commit
- Merged in dev (pull request #18) · e1166f1f
  zheng liu authored Feb 05, 2018
```
Dev
```
  e1166f1f
01 Feb, 2018 2 commits
- feat: token to asset · a21d562b
  liuzheng712 authored Feb 01, 2018
  
  a21d562b
- feat(interactive.py): add Ctrl-C and Ctrl-D · c1813021
  liuzheng712 authored Feb 01, 2018
  
  c1813021
30 Jan, 2018 1 commit
- [Bugfix] 回车直接登陆资产 · 08752ff7
  ibuler authored Jan 30, 2018
  
  08752ff7
29 Jan, 2018 6 commits
- [Merge] merge with dev · 5e63bfc3
  ibuler authored Jan 29, 2018
  
  5e63bfc3
- Merge branch 'socketio' into dev · 5ddb997b
  ibuler authored Jan 29, 2018
  
  5ddb997b
- [Update] 修改httpd支持token · 36016ccf
  ibuler authored Jan 29, 2018
  
  36016ccf
- Merge branch 'dev' into test · 1a691f79
  ibuler authored Jan 29, 2018
  
  1a691f79
- [Update] 修改app name 获取规则 · f13fd999
  ibuler authored Jan 29, 2018
  
  f13fd999
- [Update] 修改config · 7e68593d
  ibuler authored Jan 29, 2018
  
  7e68593d
26 Jan, 2018 8 commits
- [Bugfix] merge · 3319818f
  ibuler authored Jan 26, 2018
  
  3319818f
- Merge branch 'dev' into test · ce31e68e
  ibuler authored Jan 26, 2018
  
  ce31e68e
- [Bugfix] For s3 debug · 619e01ca
  ibuler authored Jan 26, 2018
  
  619e01ca
- Merge branch 'dev' into test · f08ba199
  ibuler authored Jan 26, 2018
  
  f08ba199
- Merge branch 'test' of bitbucket.org:jumpserver/coco into test · 4b208944
  ibuler authored Jan 26, 2018
  
  4b208944
- [Bugfix] 修改docker_config · 3bc45cf6
  ibuler authored Jan 26, 2018
  
  3bc45cf6
- feat: publish · 433574ce
  liuzheng712 authored Jan 26, 2018
  
  433574ce
- Merge branch 'dev' of bitbucket.org:jumpserver/coco into dev · 3636333c
  liuzheng712 authored Jan 26, 2018
  
  3636333c