github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
2,987 Commits
64 Branches
246 Tags
105 MiB
Commit Graph

956 Commits (9ac7f26c74dc1a59025cbc4134c3716cc6d82e22)

Author SHA1 Message Date
ibuler 39fff235d1 [Bugfix] 修复cluster创建的bug 2018-01-14 18:02:11 +08:00
ibuler 7316661eb5 [Update] 启动加载common setting 2018-01-12 16:37:55 +08:00
ibuler d48f8dceb5 [Update] 修改翻译 2018-01-12 15:55:08 +08:00
ibuler abb1a40a4f [Feature] 添加basic settings 2018-01-12 15:43:26 +08:00
ibuler 121f56f44b [Feature] 添加setting页面 2018-01-11 20:10:27 +08:00
ibuler b49e3b8f84 [Update] api 返回platform, 并增加web terminal nav 2018-01-10 19:39:22 +08:00
ibuler 9bf6b12904 Merge remote-tracking branch 'github/dev' into dev 2018-01-10 18:11:23 +08:00
ibuler 6aaa106aff [Bugfix] 修复以下bug 
1. 查看执行历史异常
2. 用户授权资产页显示message
 2018-01-10 18:08:27 +08:00
q4speed 576ddbf673 修复全选按钮在搜索后仍然选择全部的问题 2018-01-10 17:56:50 +08:00
ibuler d415e81add Merge remote-tracking branch 'github/dev' into dev 2018-01-10 17:41:57 +08:00
ibuler 3223d3b74d [Bugfix] 修复了一些显示上的bug 2018-01-10 17:38:10 +08:00
q4speed 7f3d32a876 Merge remote-tracking branch 'origin/dev' into dev 2018-01-10 16:42:57 +08:00
q4speed 6d7b596854 修改tab样式 2018-01-10 16:42:30 +08:00
ibuler b2b123b41e [Bugfix] 用户添加报错 2018-01-10 15:15:29 +08:00
ibuler 99cd685194 [Bugfix] 默认default cluster 2018-01-10 12:03:35 +08:00
ibuler 7e23d2c234 [Bugfix] 修复重置密码bug 2018-01-10 11:31:25 +08:00
ibuler b4080be5be [Update] 修改一些翻译 2018-01-10 00:38:21 +08:00
ibuler 22af44211d [Update] set default cluster 2018-01-09 23:33:14 +08:00
ibuler a4d02adb22 [Update] system user form add label 2018-01-09 23:14:25 +08:00
ibuler 72a82c41ee [Update] 修改 success message, 添加资产组时可以添加资产 2018-01-09 23:07:53 +08:00
ibuler 450a9495ec [Bug&Update] 以下bug和功能 
- 修复新建资产不选管理用户和集群异常bug
- profile下拉增加icon
- 授权api增加os和platform
 2018-01-09 13:10:28 +08:00
ibuler c0829194dc [Update] 修改一些bug, 增加执行task的按钮 2018-01-08 19:16:28 +08:00
ibuler dfaf029a68 [Bugfix] 资产导入bugfix 2018-01-08 15:51:08 +08:00
ibuler 3f1863151a [Bugfix] 修复session搜索bug 2018-01-08 15:15:21 +08:00
ibuler 676d640e70 [Bugfix] 修复导出csv和更新资产环境变量冲突 2018-01-08 14:58:07 +08:00
ibuler c7d1ba1944 [Update] Middleware 写法升级到新版本, Task login require 2018-01-08 14:18:02 +08:00
ibuler 07a70311df [Bugfix] 修复以下bug 
- 删除用户报错，上次更新带来的
- 管理员用户页面会看到所有主机的，而不是授权给自己的
- 授权详情页面 资产显示无效
 2018-01-08 11:22:19 +08:00
ibuler c16471d54f [Bugfix] 资产导入中下载模板异常 2018-01-05 19:09:42 +08:00
ibuler 9a6bc9fec5 [Update] session添加登陆ip 2018-01-05 18:37:36 +08:00
ibuler 1888c698f1 [Bugfix] 修复一些bug 2018-01-05 17:57:02 +08:00
ibuler afce4c81a8 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2018-01-05 14:56:50 +08:00
ibuler 28223421b1 [Bugfix] 修复一下bug 
1. 添加管理用户时同名的异常
2. 添加授权规则的检查
 2018-01-05 14:36:49 +08:00
ibuler 56fd18241d [Update] 修改一些翻译 2018-01-04 09:29:54 +08:00
q4speed 9a2fbba956 修改访问官网链接 2018-01-03 15:07:46 +08:00
ibuler a327c46229 Merge remote-tracking branch 'github/dev' into dev 2018-01-02 19:37:56 +08:00
ibuler 720dc9ab05 [Bugfix] 修复以下bug 
- session时区
- 切换管理和用户页面cookie问题
- 创建权限时验证
- 一些翻译
 2018-01-02 19:36:13 +08:00
q4speed 25fa392dda 修复图片高度和大小 2018-01-02 17:51:25 +08:00
q4speed ad3297ff2f 显示个人头像 2018-01-02 17:40:49 +08:00
q4speed ab27d1c193 修改菜单折叠起来时Logo 2018-01-02 17:31:20 +08:00
q4speed 8160425672 修改Logo 2018-01-02 17:07:00 +08:00
ibuler 68ccec6b9c [UPdate] 修改cookie设置 2018-01-02 17:02:03 +08:00
ibuler 239a829c20 [Bugfix] support xvdx disk 2018-01-02 14:49:52 +08:00
ibuler 4dbf332a56 [Bugfix] 修复刷新硬件的bug 2018-01-02 14:29:37 +08:00
ibuler e8a72c8c7d [Update] 修改一些翻译 2018-01-01 19:55:37 +08:00
ibuler 73a99de55c [Update] 修改terminal翻译 2018-01-01 15:39:35 +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 0916757eb8 [Bugfix] 修复一些bug 2017-12-31 21:51:25 +08:00
ibuler 0b299344a7 [Update] 修改database 表现 2017-12-31 12:20:08 +08:00
ibuler 13b610c140 [Change] 仅点击checkbox选中 2017-12-31 11:14:02 +08:00
ibuler a755882100 [Bugfix] 修复打印中文报错异常 2017-12-30 22:26:05 +08:00
ibuler 6586bef84c [Modify] Add access log 2017-12-30 20:45:54 +08:00
ibuler e0a3fafbd5 [Bugfix] 详见trello 2017-12-30 02:29:29 +08:00
ibuler 3804ab532d [Update] 修改信号 2017-12-29 23:53:45 +08:00
ibuler 158678c2db [Bugfix] 修改bug，显示cluster 2017-12-28 18:01:15 +08:00
ibuler 2cceb281c2 Merge remote-tracking branch 'github/new_api' into dev 2017-12-28 17:44:59 +08:00
liuzheng712 14de3ba5de Merge branch 'new_api' of github.com:jumpserver/jumpserver into new_api 2017-12-28 17:41:00 +08:00
liuzheng712 ac3ee4c317 feat: luna window 2017-12-28 17:39:24 +08:00
ibuler 69f723c8f5 [Bugfix] requirements 添加openssh-cleints 2017-12-28 16:06:07 +08:00
ibuler f992347fc5 [Update] 修改become信息 2017-12-28 14:25:56 +08:00
ibuler e20444983d [Bugfix] 修改html bug 2017-12-28 12:25:43 +08:00
ibuler 827246ed4c Update ansible remote tmp 2017-12-28 12:03:02 +08:00
ibuler 825edadc13 [Update] Add build no 2017-12-28 01:08:39 +08:00
ibuler 1c20f519a9 [Bugfix] 修改小的bug 2017-12-27 11:22:44 +08:00
ibuler 0848893f1e [Bugfix] 修复时间日期搜索的bug，select2模块自适应长度 2017-12-27 01:29:23 +08:00
ibuler 3d705dbeaa [Bugfix] 修复一些bug 2017-12-27 00:14:46 +08:00
ibuler 22b7b84a45 [Update] 修改创建默认集群，组等名称为Default 2017-12-26 22:14:37 +08:00
ibuler 6a6d0cf279 [Update] Change user model 2017-12-26 02:01:19 +08:00
ibuler a39e0a1db9 [Docker] For docker update 2017-12-26 01:54:10 +08:00
ibuler f4beccddae [Update] 修改注册流程 2017-12-25 12:22:49 +08:00
ibuler 8b081cd6b0 [Update] 修改 运行脚本 2017-12-25 00:36:14 +08:00
ibuler 209200dc4f [Update] 修改migrations 2017-12-24 23:23:05 +08:00
ibuler d0ef1e715e [Add] Add initial migrations 2017-12-24 23:21:05 +08:00
ibuler bf9bb1b973 [Update] 修改ops task运行 2017-12-24 18:53:07 +08:00
ibuler 30efec1b09 [Update] 修改 task 运行机制 2017-12-22 21:42:12 +08:00
ibuler 4893c4664d [Update] 修改task定时运行机制 2017-12-22 02:08:29 +08:00
ibuler 47040a61c8 [Bugfix] User first login 2017-12-21 19:33:16 +08:00
ibuler d33ae9d9d9 [Update] login add cookie test 2017-12-21 19:15:12 +08:00
ibuler d51b3eff6a [Update] 修改settings和配置文件 2017-12-21 18:54:29 +08:00
ibuler ec45c56868 [Change] 修改media地址 2017-12-21 16:04:24 +08:00
ibuler e1b23a7cb4 [Bugfix] 修复无法记录日志的bug 2017-12-21 15:28:21 +08:00
ibuler 76df1de634 [Bugfix] 修复一些明显的bug 2017-12-21 11:31:13 +08:00
ibuler 5a92972120 [Bugfix] 修复ops一些功能的bug 2017-12-20 11:30:15 +08:00
ibuler 3f89701b84 [Bugfix] 修复授权和资产的一部分bug 2017-12-19 19:38:09 +08:00
ibuler b0eace6ad8 [Bugfix] 基本完成assets模块 2017-12-19 12:41:00 +08:00
ibuler b4e1ac1953 [Bugfix] 修复资产模块中一些bug 2017-12-18 22:48:19 +08:00
ibuler a308000d2e [Bugfix] 修改users模块一些bug 2017-12-18 18:38:30 +08:00
ibuler e1163895e2 [Update] 系统用户api允许app user获取 2017-12-16 17:21:30 +08:00
ibuler 1b6fd4d13a [Bugfix] 修改普通用户获取资产详情的bug 2017-12-16 17:16:40 +08:00
ibuler 0f64d39cc5 Merge branch 'new_api' of github.com:jumpserver/jumpserver into new_api 2017-12-15 18:56:21 +08:00
ibuler 5e1eff19b7 [Change] Add terminal migrations force 2017-12-15 18:55:36 +08:00
ibuler 6cee62696c [Feature] 翻译，并增加设置导航 2017-12-15 17:38:46 +08:00
ibuler 11fa3e08e9 [Bugfix] 修改ts_to_date bug 2017-12-15 17:08:22 +08:00
ibuler 2d0be8f996 [git status 2017-12-15 17:07:52 +08:00
ibuler b97d5b0960 [Feature] assets task 修改 2017-12-15 15:50:15 +08:00
ibuler 08e1788426 [Feature] 打算拆分下载和上传为独立模块，时间有限暂时放弃 2017-12-14 21:27:14 +08:00
ibuler 160b01ec12 Merge branch 'new_api' into ops 2017-12-13 18:10:41 +08:00
ibuler 17ddb3bbbd [Feture] 使用信号解耦 2017-12-13 17:21:08 +08:00
liuzheng712 ef1bbc29b5 fix: update the terminal app 2017-12-13 00:34:04 +08:00
ibuler ffa7e58025 [Bugfix] Terminal status报异常 2017-12-12 16:05:21 +08:00
ibuler 18fbfb449d [Feature] 修改url pattern 精确匹配uuid 2017-12-12 15:45:01 +08:00
ibuler cb57002682 [Change] 去掉前端html中的hardcode 99991937 2017-12-12 14:38:51 +08:00
ibuler 722863428d [Feature] 添加context_processor 2017-12-12 14:28:12 +08:00
ibuler 99b4c66b5e [Feature] 添加signals 解耦代码 2017-12-12 12:19:45 +08:00
ibuler cbc000696e [Feature] 修改adminuser systemuser cluster及他们的关系 2017-12-11 17:08:43 +08:00
ibuler 0c9e24dc59 [Feture] 添加ops 页面 2017-12-11 00:29:25 +08:00
ibuler 18fd04d63c [Stash] Test case 通不过，import error 2017-12-08 10:15:27 +08:00
ibuler 27a1849b1d [Change] 修改idc => cluster 2017-12-07 16:25:50 +08:00
ibuler 32fd9bb42f Merge branch 'new_api' into ops 2017-12-07 13:28:29 +08:00
ibuler 15f6d5c9c0 [Bugfix] terminal tasks main()运行时，可能数据库还不存在 2017-12-07 13:28:11 +08:00
ibuler 2b3551f1fc [Feature] 修改ansible和ops 2017-12-07 13:01:33 +08:00
ibuler e57121a780 [Feature] 优化Ops ansible api 2017-12-06 18:31:51 +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 71a3079221 [Feature] 离线session完成 2017-12-04 16:41:00 +08:00
ibuler 9b6696bb6e [Feture] session detail页面，包含命令列表 2017-12-04 00:21:26 +08:00
ibuler 01558c985a [Feture] 添加session 列表，并支持kill session 2017-12-03 20:42:36 +08:00
ibuler bf8fa95597 [Update] 修改session 2017-12-01 21:22:32 +08:00
ibuler 94462bddb3 [Bugfix] 修改api view name 2017-12-01 17:55:19 +08:00
ibuler 1920a0f03d [Bugfix] 修改nav小bug 2017-12-01 17:37:46 +08:00
ibuler f74422e4bb [Bugfix] 更改application models后导致 terminalstatus报错 2017-12-01 17:35:28 +08:00
ibuler 3120cef335 [Change] 修改导航列表 2017-12-01 17:29:57 +08:00
ibuler 61a8d95f46 [Change] Rename applications -> terminal 2017-12-01 17:28:47 +08:00
ibuler 19051d36dc [Update] 修改一些bug 2017-12-01 17:00:55 +08:00
ibuler 7910292e0f [Feature] 修改命令上传api 2017-11-29 19:27:04 +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 d80cbe270a [Update] 修改用户获取自己授权资产的api，和查询用户授权资产组等api的Url和结构 2017-11-23 11:26:17 +08:00
ibuler 818ead85ca [Feature] 增加上传replay log的api 2017-11-22 10:54:59 +08:00
ibuler 7f9ce57318 修改 terminal上报接口和api 2017-11-14 09:44:16 +08:00
ibuler 3639b190e3 Update perm api 2017-11-01 23:23:11 +08:00
ibuler 034f0a02b1 Update terminal api 2017-10-31 11:34:20 +08:00
ibuler 30c4fc9514 App user get user perms 2017-10-22 17:53:46 +08:00
ibuler 91601cce9e [Feature] Support multiple ou search 2017-10-12 14:29:00 +08:00
ibuler a4fa15a7de Update logging 2017-10-10 15:46:14 +08:00
ibuler d4ed6a97a5 [Bugfix] Update jumpserver settings 2017-10-10 14:28:32 +08:00
ibuler 0db8482873 Update ldap auth 2017-10-10 14:18:08 +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
ibuler da5b9be5ca [Bugfix] Update some translation and set warning, partial fix #646 2017-09-28 20:52:33 +08:00
ibuler d1fbbd3213 [Bugfix] Push system user have not result may be error, fixed #701 2017-09-28 07:23:46 +08:00
ibuler 688a836bbe [Copywriting] Copywriting change fixes #733 2017-09-28 07:15:36 +08:00
ibuler 5446196471 [Bugfix] #695 Asset detail add or delete system user or group mixed 2017-09-27 07:20:16 +08:00
ibuler 0f9ae9efbb Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2017-09-25 22:15:42 +08:00
ibuler 4aef5b8229 [Bugfix] export asset pof error when none of assets 2017-09-25 22:15:22 +08:00
ibuler 6903e05af1 [Bugfix] Remove pdfmake js 404 2017-09-25 21:55:48 +08:00
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
 2017-09-24 09:16:47 +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 e6537699fd [Bugfix] Update asset create template bug 2017-09-13 10:09:17 +08:00
老广 1d950c4f49 Update settings.py 2017-09-12 17:58:09 +08:00
ibuler 594ad0e14f Update db index more than 767 2017-08-31 16:54:45 +08:00
ibuler d73d6e943b update user model charfield max length more than 767 bug 2017-08-31 16:04:57 +08:00
本杰明 8537e3e135 Update settings (#595) 
修改redis有密码无法连接bug
 2017-08-03 15:24:16 +08:00
ibuler cd1d690fd3 [Bugfix] 修复一些bug 2017-07-28 21:52:43 +08:00
中国娃 67e953902b Update utils.py (#579) 2017-07-28 20:42:16 +08:00
ibuler 5ffd1f99fd [Bugfix] 修复更新bug 2017-07-24 22:42:01 +08:00
ibuler cc1a339142 [bugfix] system user update bug 2017-07-24 21:59:55 +08:00
ibuler 1c78526f86 Fix bug 2017-07-20 07:58:16 +08:00
ibuler b0a5289a42 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2017-07-20 07:55:45 +08:00
ibuler 477d23ea37 fix some bug 2017-07-20 07:55:24 +08:00
tonygatescxp 72c2290300 Update settings.py (#515) 
修正Redis连接字符串
 2017-07-17 17:18:14 +08:00
ibuler 61014c747e Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2017-07-15 13:51:15 +08:00
ibuler b2ba1f3ca5 update requirements 2017-07-15 13:50:56 +08:00
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")]
 2017-07-13 14:00:17 +08:00
ibuler d012880a90 [Bugfix] 修复bug 2017-07-13 11:46:56 +08:00
ibuler 143cabe5fc update settings 2017-07-10 11:02:51 +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
Fengxu Lin 26a169d938 fix bug in pagination_range function (#511) 
start and end may be float when current_num >= 3 and display % 2 == 1
 2017-07-10 10:39:18 +08:00
ibuler 4e67749eef [Docs] 添加api dockers 2017-07-10 10:26:17 +08:00
ibuler f3a50610af [Update] update docker-compose 2017-06-19 23:15:09 +08:00
ibuler 4141ae517f update docker-compose 2017-06-19 18:13:44 +08:00
ibuler 29095a869c [Demo] update demo mode code 2017-06-19 17:59:13 +08:00
ibuler cda22a6f0d add demo mode middleware 2017-06-15 22:35:03 +08:00
Caijun 8f4d8b1c02 Compile messages (#495) 2017-06-13 17:51:12 +08:00
Caijun b502b06e82 Support i18n for asset `platform` field (#494) 2017-06-13 16:38:33 +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
bdlzhx b680a42425 change sign_t return from bytes to str. (#480) 2017-06-06 11:22:29 +08:00
Caijun cf07a6ebb7 Fix judging request.user valid on UserToken API (#476) 2017-06-02 17:15:59 +08:00
njqaaa dd6c82b168 fix left's users logout (#446) 
* fix left's users logout

* fix issues 445
 2017-05-25 14:12:16 +08:00
crisewng 18169251fa [Bugfix] 修复管理用户上传私钥兼容问题 (#451) 2017-05-25 11:14:21 +08:00
ibuler 1719eee264 [Bugfix] 修复py3 bytes bug 2017-05-24 20:12:50 +08:00
ibuler 41633be1aa [Bugfix] 修复无法删除资产组 2017-05-22 20:30:31 +08:00
ibuler d2620a655c [Bugfix] 修复模板bug, 修复getattr bug 2017-05-22 20:18:13 +08:00
ibuler 31025b8c52 [bugfix] 修复重置密码bug 2017-05-22 19:51:54 +08:00
ibuler 25f3d5bf02 [Bugfix] 修复翻译一处bug 2017-05-22 19:48:15 +08:00
ibuler edc631ad60 [Docker] 添加Docker compose 2017-05-20 00:19:10 +08:00
GuangHongwei ff374b7141 [Docker] Build a docker 2017-05-17 09:42:32 +08:00
GuangHongwei 458989328e [Bugfix] 修改bug，使用py3编程 2017-05-15 23:39:54 +08:00
ibuler 2ec0ab871a Fix form bug 2017-04-12 18:06:32 +08:00
ibuler 695e4da85e [Fixture] 完成批量更新 2017-04-12 11:50:15 +08:00
ibuler 2aa9aafdf6 [Change] Bulk update asset 2017-04-11 17:29:53 +08:00
ibuler 071d1922d0 stash it 2017-04-10 22:55:15 +08:00
ibuler 95e64d7809 [Change] 修改导出和更新逻辑 2017-04-09 17:59:14 +08:00
ibuler 5418d0b44c [Change] Using csv replace xlsx 2017-04-09 00:45:28 +08:00
ibuler bcc065eb8f [Compat] compat py3 change bootstrap form to bootstrap3 2017-04-07 23:52:46 +08:00
ibuler a320b9e05e [Bugfix] 兼容py3 2017-04-07 19:11:27 +08:00
ibuler b913bce398 [Bugfix] 修改翻译bug 2017-04-07 17:09:25 +08:00
ibuler c11374ae39 [Bugfix] 修改翻译 2017-04-07 16:59:09 +08:00
ibuler 92ebe85a3f [Fixture] 详情页添加system user 推送 2017-04-05 19:09:51 +08:00
ibuler be09db059d Update some bug 2017-04-04 21:47:58 +08:00
ibuler 5a5d5bdd51 [Fixture] 添加更新硬件信息api 2017-04-04 19:16:34 +08:00
ibuler 992af0f1cb [Fixture] 拆分asset view 2017-04-04 11:37:52 +08:00
ibuler ac3553babb [Fixture] 修改asset detail 2017-04-04 11:14:59 +08:00
ibuler 97fb2a4fe6 [Fixture] 修改index页面 2017-04-03 00:27:18 +08:00
ibuler 709552f14c [Fixture] 添加首页 2017-04-02 18:09:40 +08:00
ibuler 66a2262ee9 [Fixture] 增加 asset groups assets api 2017-04-01 00:41:16 +08:00
ibuler 067426d5e0 [Fixture] 完成用户向导页 2017-03-31 23:46:00 +08:00
ibuler 135899608e Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver 2017-03-31 18:48:11 +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 4e7b665ea8 [Change] 添加翻译，并添加用户登陆页面 2017-03-29 15:26:32 +08:00
右书僮 b34c5dde40 Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver 
# Conflicts:
#	apps/assets/templates/assets/asset_list.html
 2017-03-27 08:03:23 +08:00
右书僮 9de2ff2052 修复idc_list删除时重新加载table 2017-03-27 07:58:35 +08:00
ibuler a4ad9b49b9 Merge branch 'audits' 2017-03-26 19:41:17 +08:00
ibuler 90055f7680 [Bugfix] 添加翻译 2017-03-26 19:41:10 +08:00
ibuler 49f6ed524d Merge with master 2017-03-26 11:54:46 +08:00
ibuler 1f9dbb6bdc [Change] 修复验证码模糊度 2017-03-24 23:13:17 +08:00
ibuler 10eb13920b [Delete] 删除资产tag 2017-03-24 14:48:18 +08:00
ibuler a57dac0706 [Fixture] 拆分proxy log 为在线和离线 2017-03-24 14:23:51 +08:00
右书僮 e0179ea332 删除资产HTML页面中SystemUser相关内容(视图中的相关API暂时未动) 2017-03-24 11:13:40 +08:00
右书僮 c931d3179b 修复资产组更新中 用户己选择的资产项不全问题 2017-03-24 11:02:55 +08:00
右书僮 c5666f1357 fix some files 2017-03-24 10:37:05 +08:00
ibuler b60e5a7ee3 [Change] 修改一些view 2017-03-24 00:27:33 +08:00
ibuler c940a4c0fb [Fixture] 增加 task list 删除按钮 2017-03-23 00:15:25 +08:00
ibuler 3f72ce4b1f [Update] 更新生成fake数据脚本 2017-03-22 23:36:43 +08:00
ibuler 2ae57a7970 [Delete] 删除 system user一些属性 2017-03-22 22:15:15 +08:00
ibuler 610c9c5149 Pull it 2017-03-22 22:05:24 +08:00
ibuler caec9709ef [Fixture] 添加task list 搜索，重试 2017-03-22 21:57:05 +08:00
ibuler a4504dc0c7 [Change] 拆分tasks 2017-03-16 00:43:43 +08:00
ibuler 0fbd9843bd [Change] 修改runner, inventory位置 2017-03-16 00:19:47 +08:00
ibuler 240c7db416 [Fixture] 添加 rerun function 2017-03-14 14:15:13 +08:00
ibuler 915873135e [Fixture] 添加runner run record 2017-03-14 00:58:25 +08:00
ibuler a822f667af [Fixture] 完成用户推送task 2017-03-09 14:55:33 +08:00
ibuler c234b5b2d5 Update AdHocRunner 2017-03-06 23:34:54 +08:00
xiaokong1937@gmail.com 694899799b trivial changes 2017-03-06 21:05:00 +08:00
ibuler eb5a9dd20f Remote ansible_api file 2017-03-05 23:30:14 +08:00
ibuler 6015f2423b [Fixture] 添加PlaybookRunner 2017-03-05 20:53:24 +08:00
ibuler 01e50d592e 完成AdHoc JMSHost JMSInventory 2017-03-05 11:38:02 +08:00
ibuler ab62bfca7e [Bugfix] 修改一些bug 2017-03-04 16:38:26 +08:00
ibuler 9c2c38c74a [Bugfix] 修复导入自定义过滤器问题 2017-03-03 15:15:10 +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
ibuler 7825c107ab [Bugfix] model FieldError 2017-03-01 15:30:19 +08:00
右书僮 dd5dd9d7e1 fixed html files 2017-02-25 23:20:20 +08:00
Webb 63fd3cfff2 fixed asset_group delete html 2017-02-25 20:18:13 +08:00
Webb a6825ac91e fixed asset_list html and asset_update 2017-02-25 17:25:27 +08:00
Webb 8ee9d02ffc fixed html 2017-02-24 21:29:11 +08:00
ibuler 008be6a8e3 [Fixtrue] 完成terminal detail 和批量结束会话 2017-02-12 16:51:32 +08:00
ibuler 1f544b98ab [Stash] 删除结束会话之前 2017-02-11 19:49:15 +08:00
ibuler 42e4c64d06 [Bugfix] 修复一些bug 2017-02-11 12:13:02 +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
ibuler 9c7bd7d285 [Fixture] 添加record log 2017-02-07 21:51:44 +08:00
ibuler a79c3dd156 [Fixture] 添加command log backends, 未来支持es 2017-02-06 23:13:27 +08:00
xiaokong1937@gmail.com fe01f92545 user profile: update ssh pk 2017-02-03 13:37:05 +08:00
xiaokong1937@gmail.com 8a5d0b2d92 remove unused templatetags: users_tags and common_tags 2017-01-26 20:24:50 +08:00
xiaokong1937@gmail.com f3647ea46d user-profile page 2017-01-25 21:19:16 +08:00
xiaokong1937@gmail.com 31bded8953 CAPTCHA_TEST_MODE settings and small fix 2017-01-23 12:29:36 +08:00
ibuler 0869931e67 [Bugfix] 修改了一些issue上的bug 2017-01-20 20:13:22 +08:00
ibuler df94d11f53 [Fix] 修改一些api bug 2017-01-20 13:59:53 +08:00
ibuler ffed28c9c7 [Change] 修改perm的代码， 强制79个字符内 2017-01-17 17:11:01 +08:00
ibuler 25cb47d2f5 [Change] 拆分user view为多个view 2017-01-17 16:34:47 +08:00
ibuler 87bbb6afde [Bugfix] 修改添加系统用户view 2017-01-10 23:41:14 +08:00
ibuler 8916221bba [Bugfix] 紧急修复url解析失败错误 2017-01-10 18:03:00 +08:00
ibuler 8658675f67 [Bugfix] 重命名applications导致api请求content_type不对 2017-01-09 23:12:32 +08:00
ibuler be3f94d86c [BugFix] 修改requirements添加新的库 2017-01-09 01:58:23 +08:00
ibuler 17657deb0e [Bugfix] 和Master分支合并后，修复冲突，DRF 新版本要求 fields和exclude 2017-01-08 13:35:59 +08:00
ibuler 49861b6a84 Merge with master 2017-01-07 22:34:12 +08:00
ibuler 3da33a57e2 [Bugfix] 修改tab -> space, 删除system user的 as default 2017-01-07 20:17:22 +08:00
ibuler 9c6c6d6b4c [Feature] 添加Dockerfile 2017-01-07 20:07:33 +08:00
右书僮 dbdb8a58fe 资产相关API及Web 2017-01-06 20:34:24 +08:00
ibuler b670259ab6 Modify terminal reqject templatte 2017-01-03 00:11:44 +08:00
ibuler 0907f5021e Finish form ajax submmit 2016-12-30 22:21:50 +08:00
ibuler 301e02bcd8 Update some api 2016-12-30 00:19:47 +08:00
ibuler 70da177ed7 Update api 2016-12-29 19:17:00 +08:00
ibuler 92d854b971 Update api 2016-12-29 00:29:59 +08:00
ibuler d80fec6e60 Update some api 2016-12-28 00:28:52 +08:00
ibuler d56f030dc4 Finish terminal accept 2016-12-27 00:59:52 +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 c5ab49c515 Finish access key auth 2016-12-25 13:15:19 +08:00
ibuler fe17bec752 Add access key auth 2016-12-22 01:07:05 +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 589b6d7cfe update 2016-12-21 01:03:52 +08:00
ibuler 649509dec1 Change models dir 2016-12-21 00:43:52 +08:00
ibuler 4d96978b4f Merge branch 'master' into audits 2016-12-20 23:08:09 +08:00
ibuler 81ec121918 Merge branch 'master' of code.jumpserver.org:jumpserver/jumpserver 2016-12-20 23:07:57 +08:00
ibuler a448fd02e2 merged 2016-12-20 23:07:33 +08:00
ibuler 96d32f2e3e prepare merge ops 2016-12-20 23:06:27 +08:00
ibuler 4d71c2d1ff 修改token获取，拆分认证文件和权限文件 2016-12-20 01:19:50 +08:00
yumaojun03 046c7e21e9 Merge remote-tracking branch 'origin/master' into ops_dev 
# Conflicts:
#	requirements.txt
 2016-12-19 23:55:54 +08:00
yumaojun03 47d87e38a6 补充task需要的一些接口 2016-12-19 23:46:03 +08:00
ibuler 2ab8e92bf4 Add black line 2016-12-19 23:10:16 +08:00
yumaojun03 150e1030c3 ansible Task接口更上层抽象的基本实现 2016-12-19 14:07:21 +08:00
yumaojun03 86c5f0d3d3 完成cron和sudo的list和detail基础，ansible Task接口更上层抽象中 2016-12-19 00:24:51 +08:00
ibuler d964221689 Update api 2016-12-16 19:32:05 +08:00