1. 01 Dec, 2017 5 commits
  2. 29 Nov, 2017 1 commit
  3. 23 Nov, 2017 3 commits
  4. 22 Nov, 2017 1 commit
  5. 14 Nov, 2017 1 commit
  6. 01 Nov, 2017 1 commit
  7. 31 Oct, 2017 1 commit
  8. 22 Oct, 2017 1 commit
  9. 12 Oct, 2017 1 commit
  10. 10 Oct, 2017 3 commits
  11. 08 Oct, 2017 1 commit
  12. 28 Sep, 2017 4 commits
  13. 27 Sep, 2017 4 commits
  14. 25 Sep, 2017 3 commits
  15. 24 Sep, 2017 4 commits
    • Caijun's avatar
      Fix importing csv bugs (#717) · 43a0c4fe
      Caijun authored
      * Fix exporting csv bugs
      
      1. auto detect the encoding of csv
      2. if id in csv is empty, let it equal 0
      3. if hostname exists, give up this asset
      
      * Add chardet to requirements.txt
      43a0c4fe
    • 老广's avatar
      Update requirements.txt · 8342ba68
      老广 authored
      8342ba68
    • crisewng's avatar
      更新Mac安装ldap失败解决方法 (#613) · 48ef5c42
      crisewng authored
      48ef5c42
    • 管宜尧's avatar
      bugfix: 解决用户失效时间为空时,无法使用密码进行ssh登录跳板机的问题 (#659) · 290872dc
      管宜尧 authored
      * bugfix: 解决用户失效时间为空时,无法使用密码进行ssh登录跳板机的问题
      
      bugfix: 解决用户失效时间为空时,无法使用密码进行ssh登录跳板机的问题。
      
      ```
      AttributeError at /api/users/v1/auth/
      'NoneType' object has no attribute 'strftime'
      
      Request Method: POST
      Request URL: http://127.0.0.1:8080/api/users/v1/auth/
      Django Version: 1.11.4
      Python Executable: /opt/py3/bin/python
      Python Version: 3.6.1
      Python Path: ['/data/deployment/jumpserver/apps', '/usr/local/lib/python36.zip', '/usr/local/lib/python3.6', '/usr/local/lib/python3.6/lib-dynload', '/opt/py3/lib/python3.6/site-packages', '/data/deployment/jumpserver', '/data/deployment/jumpserver/apps']
      Server time: Wed, 30 Aug 2017 23:18:47 +0800
      Installed Applications:
      ['users.apps.UsersConfig',
       'assets.apps.AssetsConfig',
       'perms.apps.PermsConfig',
       'ops.apps.OpsConfig',
       'audits.apps.AuditsConfig',
       'common.apps.CommonConfig',
       'applications.apps.ApplicationsConfig',
       'rest_framework',
       'rest_framework_swagger',
       'django_filters',
       'bootstrap3',
       'captcha',
       'django.contrib.auth',
       'django.contrib.contenttypes',
       'django.contrib.sessions',
       'django.contrib.messages',
       'django.contrib.staticfiles']
      Installed Middleware:
      ['django.middleware.security.SecurityMiddleware',
       'django.contrib.sessions.middleware.SessionMiddleware',
       'django.middleware.locale.LocaleMiddleware',
       'django.middleware.common.CommonMiddleware',
       'django.middleware.csrf.CsrfViewMiddleware',
       'django.contrib.auth.middleware.AuthenticationMiddleware',
       'django.contrib.messages.middleware.MessageMiddleware',
       'django.middleware.clickjacking.XFrameOptionsMiddleware',
       'jumpserver.middleware.TimezoneMiddleware',
       'jumpserver.middleware.DemoMiddleware']
      
      
      Traceback:  
      
      File "/opt/py3/lib/python3.6/site-packages/django/core/handlers/exception.py" in inner
        41.             response = get_response(request)
      File "/opt/py3/lib/python3.6/site-packages/django/core/handlers/base.py" in _get_response
        187.                 response = self.process_exception_by_middleware(e, request)
      File "/opt/py3/lib/python3.6/site-packages/django/core/handlers/base.py" in _get_response
        185.                 response = wrapped_callback(request, *callback_args, **callback_kwargs)
      File "/usr/local/lib/python3.6/contextlib.py" in inner
        53.                 return func(*args, **kwds)
      File "/opt/py3/lib/python3.6/site-packages/django/views/decorators/csrf.py" in wrapped_view
        58.         return view_func(*args, **kwargs)
      File "/opt/py3/lib/python3.6/site-packages/django/views/generic/base.py" in view
        68.             return self.dispatch(request, *args, **kwargs)
      File "/opt/py3/lib/python3.6/site-packages/rest_framework/views.py" in dispatch
        489.             response = self.handle_exception(exc)
      File "/opt/py3/lib/python3.6/site-packages/rest_framework/views.py" in handle_exception
        449.             self.raise_uncaught_exception(exc)
      File "/opt/py3/lib/python3.6/site-packages/rest_framework/views.py" in dispatch
        486.             response = handler(request, *args, **kwargs)
      File "/data/deployment/jumpserver/apps/users/api.py" in post
        166.             return Response({'token': token, 'user': user.to_json()})
      File "/data/deployment/jumpserver/apps/users/models/user.py" in to_json
        207.             'date_expired': self.date_expired.strftime('%Y-%m-%d %H:%M:%S')
      
      Exception Type: AttributeError at /api/users/v1/auth/
      Exception Value: 'NoneType' object has no attribute 'strftime'
      Request information:
      USER: AnonymousUser
      GET: No GET data
      POST: No POST data
      FILES: No FILES data
      COOKIES: No cookie data
      ```
      
      * bugfix: 个人信息页面个人信息pannel错位
      
      bugfix: 个人信息页面个人信息pannel错位
      290872dc
  16. 14 Sep, 2017 1 commit
  17. 13 Sep, 2017 1 commit
  18. 12 Sep, 2017 1 commit
  19. 08 Sep, 2017 1 commit
  20. 31 Aug, 2017 2 commits