ibuler
|
121f56f44b
|
[Feature] 添加setting页面
|
2018-01-11 20:10:27 +08:00 |
ibuler
|
450a9495ec
|
[Bug&Update] 以下bug和功能
- 修复新建资产不选管理用户和集群异常bug
- profile下拉增加icon
- 授权api增加os和platform
|
2018-01-09 13:10:28 +08:00 |
ibuler
|
3b6403b2f2
|
[Update] 修改一些翻译
|
2018-01-01 15:08:33 +08:00 |
ibuler
|
c48531c586
|
[Update] 添加和修改部分翻译
|
2018-01-01 00:45:12 +08:00 |
ibuler
|
e0a3fafbd5
|
[Bugfix] 详见trello
|
2017-12-30 02:29:29 +08:00 |
ibuler
|
f4beccddae
|
[Update] 修改注册流程
|
2017-12-25 12:22:49 +08:00 |
ibuler
|
bf9bb1b973
|
[Update] 修改ops task运行
|
2017-12-24 18:53:07 +08:00 |
ibuler
|
d51b3eff6a
|
[Update] 修改settings和配置文件
|
2017-12-21 18:54:29 +08:00 |
ibuler
|
76df1de634
|
[Bugfix] 修复一些明显的bug
|
2017-12-21 11:31:13 +08:00 |
ibuler
|
08e1788426
|
[Feature] 打算拆分下载和上传为独立模块,时间有限暂时放弃
|
2017-12-14 21:27:14 +08:00 |
ibuler
|
99b4c66b5e
|
[Feature] 添加signals 解耦代码
|
2017-12-12 12:19:45 +08:00 |
ibuler
|
18fd04d63c
|
[Stash] Test case 通不过,import error
|
2017-12-08 10:15:27 +08:00 |
ibuler
|
ec8106e43d
|
[Feature] 完成登陆日志
|
2017-12-05 12:24:31 +08:00 |
ibuler
|
a5f9735906
|
[Update] 更新index view
|
2017-12-04 20:15:47 +08:00 |
ibuler
|
26607bc327
|
[Copyright] 修改copyrite
|
2017-11-23 14:35:16 +08:00 |
ibuler
|
e7f38ec894
|
[Change] 全部使用uuid作为主键
|
2017-11-23 14:08:01 +08:00 |
ibuler
|
034f0a02b1
|
Update terminal api
|
2017-10-31 11:34:20 +08:00 |
ibuler
|
8bccaa6ee2
|
Update issue template
|
2017-10-08 19:43:55 +08:00 |
ibuler
|
2ae3bec335
|
[Bugfix] Change user public key length to 5000, fixed #631
|
2017-09-28 21:37:36 +08:00 |
管宜尧
|
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错位
|
2017-09-24 08:40:59 +08:00 |
ibuler
|
d012880a90
|
[Bugfix] 修复bug
|
2017-07-13 11:46:56 +08:00 |
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)
|
2017-07-10 11:01:20 +08:00 |
ibuler
|
29095a869c
|
[Demo] update demo mode code
|
2017-06-19 17:59:13 +08:00 |
njqaaa
|
9b14244363
|
fix id_dsa check error (#458)
* fix id_dsa check error
* fix 邮件修改密码 token错误
* fix 3c8aec9 add )
|
2017-06-06 11:23:39 +08:00 |
ibuler
|
41633be1aa
|
[Bugfix] 修复无法删除资产组
|
2017-05-22 20:30:31 +08:00 |
ibuler
|
071d1922d0
|
stash it
|
2017-04-10 22:55:15 +08:00 |
ibuler
|
c11374ae39
|
[Bugfix] 修改翻译
|
2017-04-07 16:59:09 +08:00 |
ibuler
|
ac3553babb
|
[Fixture] 修改asset detail
|
2017-04-04 11:14:59 +08:00 |
ibuler
|
7720e9f3fd
|
[Change] 修改图片
|
2017-03-31 18:47:50 +08:00 |
ibuler
|
61a481f427
|
[Fixture] 添加用户连接终端
|
2017-03-31 11:25:25 +08:00 |
ibuler
|
3fa5ce5404
|
[Fixture] 添加用户信息更改
|
2017-03-30 16:28:00 +08:00 |
ibuler
|
0983f294b7
|
[Fixture] 添加用户profile
|
2017-03-30 00:51:36 +08:00 |
ibuler
|
ab62bfca7e
|
[Bugfix] 修改一些bug
|
2017-03-04 16:38:26 +08:00 |
ibuler
|
695dc96ce8
|
Merge branch 'audits'
|
2017-03-03 10:24:34 +08:00 |
ibuler
|
9518672ad2
|
Add
|
2017-03-02 18:29:29 +08:00 |
ibuler
|
b055144908
|
Merge with audits
|
2017-03-01 15:35:11 +08:00 |
xiaokong1937@gmail.com
|
548d7ef99a
|
fix #13;fix `user` context conflict problem in user-detail page
|
2017-02-09 21:19:49 +08:00 |
xiaokong1937@gmail.com
|
8a5d0b2d92
|
remove unused templatetags: users_tags and common_tags
|
2017-01-26 20:24:50 +08:00 |
ibuler
|
0869931e67
|
[Bugfix] 修改了一些issue上的bug
|
2017-01-20 20:13:22 +08:00 |
ibuler
|
25cb47d2f5
|
[Change] 拆分user view为多个view
|
2017-01-17 16:34:47 +08:00 |
ibuler
|
17657deb0e
|
[Bugfix] 和Master分支合并后,修复冲突,DRF 新版本要求 fields和exclude
|
2017-01-08 13:35:59 +08:00 |
ibuler
|
92d854b971
|
Update api
|
2016-12-29 00:29:59 +08:00 |
ibuler
|
775cd523eb
|
Update app terminal name to applications
|
2016-12-25 23:10:53 +08:00 |
ibuler
|
a8fa4d2f0c
|
update terminal regist
|
2016-12-25 17:44:39 +08:00 |
ibuler
|
2707012325
|
Finish access key auth
|
2016-12-25 13:15:28 +08:00 |
ibuler
|
5b4ce709af
|
Add private token and change user group
|
2016-12-22 00:36:31 +08:00 |
ibuler
|
875aaa0029
|
update user model for create application user
|
2016-12-21 01:17:36 +08:00 |
ibuler
|
649509dec1
|
Change models dir
|
2016-12-21 00:43:52 +08:00 |
ibuler
|
96d32f2e3e
|
prepare merge ops
|
2016-12-20 23:06:27 +08:00 |