2732 Commits (d07b427037ebb8cd28668ceef52684051ace6c97)

 

All Branches   

Search

Author	SHA1	Message	Date
ibuler	e1a8f4910f	Update readme	7 years ago
ibuler	5ddcc994de	Add issue template	7 years ago
ibuler	5446196471	[Bugfix] #695 Asset detail add or delete system user or group mixed	7 years ago
ibuler	0f9ae9efbb	Merge branch 'dev' of github.com:jumpserver/jumpserver into dev	7 years ago
ibuler	4aef5b8229	[Bugfix] export asset pof error when none of assets	7 years ago
ibuler	6903e05af1	[Bugfix] Remove pdfmake js 404	7 years ago
Caijun	43a0c4fe51	Fix importing csv bugs (#717) ... * 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	7 years ago
老广	8342ba68c0	Update requirements.txt	7 years ago
crisewng	48ef5c421b	更新Mac安装ldap失败解决方法 (#613)	7 years ago
管宜尧	290872dcad	bugfix: 解决用户失效时间为空时，无法使用密码进行ssh登录跳板机的问题 (#659) ... * 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错位	7 years ago
老广	d4fa082e17	Update Dockerfile	7 years ago
ibuler	e6537699fd	[Bugfix] Update asset create template bug	7 years ago
老广	1d950c4f49	Update settings.py	7 years ago
老广	5e197fb0db	Update README.md	7 years ago
ibuler	594ad0e14f	Update db index more than 767	7 years ago
ibuler	d73d6e943b	update user model charfield max length more than 767 bug	7 years ago
老广	eb8b02d88b	Update README.md	7 years ago
老广	c8728e52d8	Update README.md	7 years ago
本杰明	8537e3e135	Update settings (#595) ... 修改redis有密码无法连接bug	7 years ago
ibuler	cd1d690fd3	[Bugfix] 修复一些bug	7 years ago
中国娃	67e953902b	Update utils.py (#579)	7 years ago
ibuler	5ffd1f99fd	[Bugfix] 修复更新bug	7 years ago
ibuler	cc1a339142	[bugfix] system user update bug	7 years ago
ibuler	1c78526f86	Fix bug	7 years ago
ibuler	b0a5289a42	Merge branch 'dev' of github.com:jumpserver/jumpserver into dev	7 years ago
ibuler	477d23ea37	fix some bug	7 years ago
tonygatescxp	72c2290300	Update settings.py (#515) ... 修正Redis连接字符串	7 years ago
ibuler	61014c747e	Merge branch 'dev' of github.com:jumpserver/jumpserver into dev	7 years ago
ibuler	b2ba1f3ca5	update requirements	7 years ago
Eli	7c154abf70	fix bug: variable i should be the host name (#538) ... fix bug: variable i is not the host name, because summary['failed'] is something like [("hostname1", "error message 1"),("hostname1", "error message 1")]	7 years ago
ibuler	d012880a90	[Bugfix] 修复bug	7 years ago
ibuler	3ce07cf969	Update README	7 years ago
ibuler	24dd7b6347	update docker config	7 years ago
ibuler	9237c9dcee	Add requirements	7 years ago
ibuler	143cabe5fc	update settings	7 years ago
Eli	370cdc275a	添加一个资产，然后推送系统用户时出现（Asset实例无法序列化） (#477) ... * error while push systemuser. error while create assets with adminuser(ssh key) * fix errors in case of config.py dose not exist. * change sign_t return from bytes to str. (#480) * fix id_dsa check error (#458) * fix id_dsa check error * fix 邮件修改密码 token错误 * fix 3c8aec9 add ) * Dockerfile 优化 (#453)	7 years ago
老广	235cbe12ee	Update README.md	7 years ago
Fengxu Lin	26a169d938	fix bug in pagination_range function (#511) ... start and end may be float when current_num >= 3 and display % 2 == 1	7 years ago
ibuler	4e67749eef	[Docs] 添加api dockers	7 years ago
ibuler	e120fd56a6	Update readme	8 years ago
ibuler	51b9e3732f	Update readme	8 years ago
ibuler	f3a50610af	[Update] update docker-compose	8 years ago
ibuler	4141ae517f	update docker-compose	8 years ago
ibuler	29095a869c	[Demo] update demo mode code	8 years ago
ibuler	cda22a6f0d	add demo mode middleware	8 years ago
Caijun	8f4d8b1c02	Compile messages (#495)	8 years ago
Caijun	b502b06e82	Support i18n for asset `platform` field (#494)	8 years ago
谢义学	7d541ee916	Dockerfile 优化 (#453)	8 years ago
njqaaa	9b14244363	fix id_dsa check error (#458) ... * fix id_dsa check error * fix 邮件修改密码 token错误 * fix 3c8aec9 add )	8 years ago
bdlzhx	b680a42425	change sign_t return from bytes to str. (#480)	8 years ago