882 Commits (fe1862120f193a40d10678a0e5dfea12f18fc899)

Author	SHA1	Message	Date
ibuler	968b395bce	Merge branch 'es' into dev	7 years ago
ibuler	0a931bbf77	[Feature] es support	7 years ago
ibuler	17181db8a5	[Feature] 支持es存储	7 years ago
ibuler	41f1c3f7f7	[Feature] terminal config load	7 years ago
ibuler	7f18821990	[Update] remote default PAGE_SIZE stting	7 years ago
ibuler	57e508f331	[update] 修改用户创建时 姓名和用户名的位置	7 years ago
ibuler	b936d54a48	[Feature] 添加es支持	7 years ago
ibuler	67001dd99f	[Feature] 支持es存储命令	7 years ago
ibuler	3c3e9a4113	[Update] 修改翻译	7 years ago
ibuler	d08a1c3ddb	[Update] 启用ldap移动位置	7 years ago
ibuler	a77acb7dfb	[Change] 修改部分翻译	7 years ago
ibuler	ba5ab21b37	For storage	7 years ago
ibuler	ce9ff67b24	[Bugfix] 读取不到prefix	7 years ago
ibuler	5bbad01909	[Feature] 增加标签	7 years ago
ibuler	01895bafc0	[Bugfix] task运行失败，因为tasks没有设置	7 years ago
ibuler	f1ec53d1bc	[Remove] labels	7 years ago
ibuler	d3109a03b2	[Bugfix] 修复资产列表显示bug	7 years ago
ibuler	681ddb5af2	[Bugfix] for login ip	7 years ago
ibuler	29061aa088	[Bugfix] user login ip	7 years ago
ibuler	dad21cadb3	[Update] check all 只选择当前页面	7 years ago
ibuler	7e2d627d3f	[Bugfix] 资产列表选择别的页会报错	7 years ago
ibuler	cc18ad9a7f	Merge branch 'paging' into dev	7 years ago
ibuler	b2f97a263d	[Feature] 添加后端paging	7 years ago
ibuler	8b9e45ad31	[Bugfix] settings add option	7 years ago
ibuler	89e013e2e2	[Bugfix] setting tables not found	7 years ago
ibuler	59a69f0253	[Bugfix] 修复title显示Jumpserver	7 years ago
ibuler	39fff235d1	[Bugfix] 修复cluster创建的bug	7 years ago
ibuler	7316661eb5	[Update] 启动加载common setting	7 years ago
ibuler	d48f8dceb5	[Update] 修改翻译	7 years ago
ibuler	abb1a40a4f	[Feature] 添加basic settings	7 years ago
ibuler	121f56f44b	[Feature] 添加setting页面	7 years ago
ibuler	b49e3b8f84	[Update] api 返回platform, 并增加web terminal nav	7 years ago
ibuler	9bf6b12904	Merge remote-tracking branch 'github/dev' into dev	7 years ago
ibuler	6aaa106aff	[Bugfix] 修复以下bug ... 1. 查看执行历史异常 2. 用户授权资产页显示message	7 years ago
q4speed	576ddbf673	修复全选按钮在搜索后仍然选择全部的问题	7 years ago
ibuler	d415e81add	Merge remote-tracking branch 'github/dev' into dev	7 years ago
ibuler	3223d3b74d	[Bugfix] 修复了一些显示上的bug	7 years ago
q4speed	7f3d32a876	Merge remote-tracking branch 'origin/dev' into dev	7 years ago
q4speed	6d7b596854	修改tab样式	7 years ago
ibuler	b2b123b41e	[Bugfix] 用户添加报错	7 years ago
ibuler	99cd685194	[Bugfix] 默认default cluster	7 years ago
ibuler	7e23d2c234	[Bugfix] 修复重置密码bug	7 years ago
ibuler	b4080be5be	[Update] 修改一些翻译	7 years ago
ibuler	22af44211d	[Update] set default cluster	7 years ago
ibuler	a4d02adb22	[Update] system user form add label	7 years ago
ibuler	72a82c41ee	[Update] 修改 success message, 添加资产组时可以添加资产	7 years ago
ibuler	450a9495ec	[Bug&Update] 以下bug和功能 ... - 修复新建资产不选管理用户和集群异常bug - profile下拉增加icon - 授权api增加os和platform	7 years ago
ibuler	c0829194dc	[Update] 修改一些bug, 增加执行task的按钮	7 years ago
ibuler	dfaf029a68	[Bugfix] 资产导入bugfix	7 years ago
ibuler	3f1863151a	[Bugfix] 修复session搜索bug	7 years ago
ibuler	676d640e70	[Bugfix] 修复导出csv和更新资产环境变量冲突	7 years ago
ibuler	c7d1ba1944	[Update] Middleware 写法升级到新版本, Task login require	7 years ago
ibuler	07a70311df	[Bugfix] 修复以下bug ... - 删除用户报错，上次更新带来的 - 管理员用户页面会看到所有主机的，而不是授权给自己的 - 授权详情页面 资产显示无效	7 years ago
ibuler	c16471d54f	[Bugfix] 资产导入中下载模板异常	7 years ago
ibuler	9a6bc9fec5	[Update] session添加登陆ip	7 years ago
ibuler	1888c698f1	[Bugfix] 修复一些bug	7 years ago
ibuler	afce4c81a8	Merge branch 'dev' of github.com:jumpserver/jumpserver into dev	7 years ago
ibuler	28223421b1	[Bugfix] 修复一下bug ... 1. 添加管理用户时同名的异常 2. 添加授权规则的检查	7 years ago
ibuler	56fd18241d	[Update] 修改一些翻译	7 years ago
q4speed	9a2fbba956	修改访问官网链接	7 years ago
ibuler	a327c46229	Merge remote-tracking branch 'github/dev' into dev	7 years ago
ibuler	720dc9ab05	[Bugfix] 修复以下bug ... - session时区 - 切换管理和用户页面cookie问题 - 创建权限时验证 - 一些翻译	7 years ago
q4speed	25fa392dda	修复图片高度和大小	7 years ago
q4speed	ad3297ff2f	显示个人头像	7 years ago
q4speed	ab27d1c193	修改菜单折叠起来时Logo	7 years ago
q4speed	8160425672	修改Logo	7 years ago
ibuler	68ccec6b9c	[UPdate] 修改cookie设置	7 years ago
ibuler	239a829c20	[Bugfix] support xvdx disk	7 years ago
ibuler	4dbf332a56	[Bugfix] 修复刷新硬件的bug	7 years ago
ibuler	e8a72c8c7d	[Update] 修改一些翻译	7 years ago
ibuler	73a99de55c	[Update] 修改terminal翻译	7 years ago
ibuler	3b6403b2f2	[Update] 修改一些翻译	7 years ago
ibuler	c48531c586	[Update] 添加和修改部分翻译	7 years ago
ibuler	0916757eb8	[Bugfix] 修复一些bug	7 years ago
ibuler	0b299344a7	[Update] 修改database 表现	7 years ago
ibuler	13b610c140	[Change] 仅点击checkbox选中	7 years ago
ibuler	a755882100	[Bugfix] 修复打印中文报错异常	7 years ago
ibuler	6586bef84c	[Modify] Add access log	7 years ago
ibuler	e0a3fafbd5	[Bugfix] 详见trello	7 years ago
ibuler	3804ab532d	[Update] 修改信号	7 years ago
ibuler	158678c2db	[Bugfix] 修改bug，显示cluster	7 years ago
ibuler	2cceb281c2	Merge remote-tracking branch 'github/new_api' into dev	7 years ago
liuzheng712	14de3ba5de	Merge branch 'new_api' of github.com:jumpserver/jumpserver into new_api	7 years ago
liuzheng712	ac3ee4c317	feat: luna window	7 years ago
ibuler	69f723c8f5	[Bugfix] requirements 添加openssh-cleints	7 years ago
ibuler	f992347fc5	[Update] 修改become信息	7 years ago
ibuler	e20444983d	[Bugfix] 修改html bug	7 years ago
ibuler	827246ed4c	Update ansible remote tmp	7 years ago
ibuler	825edadc13	[Update] Add build no	7 years ago
ibuler	1c20f519a9	[Bugfix] 修改小的bug	7 years ago
ibuler	0848893f1e	[Bugfix] 修复时间日期搜索的bug，select2模块自适应长度	7 years ago
ibuler	3d705dbeaa	[Bugfix] 修复一些bug	7 years ago
ibuler	22b7b84a45	[Update] 修改创建默认集群，组等名称为Default	7 years ago
ibuler	6a6d0cf279	[Update] Change user model	7 years ago
ibuler	a39e0a1db9	[Docker] For docker update	7 years ago
ibuler	f4beccddae	[Update] 修改注册流程	7 years ago
ibuler	8b081cd6b0	[Update] 修改 运行脚本	7 years ago
ibuler	209200dc4f	[Update] 修改migrations	7 years ago
ibuler	d0ef1e715e	[Add] Add initial migrations	7 years ago
ibuler	bf9bb1b973	[Update] 修改ops task运行	7 years ago
ibuler	30efec1b09	[Update] 修改 task 运行机制	7 years ago
ibuler	4893c4664d	[Update] 修改task定时运行机制	7 years ago
ibuler	47040a61c8	[Bugfix] User first login	7 years ago
ibuler	d33ae9d9d9	[Update] login add cookie test	7 years ago
ibuler	d51b3eff6a	[Update] 修改settings和配置文件	7 years ago
ibuler	ec45c56868	[Change] 修改media地址	7 years ago
ibuler	e1b23a7cb4	[Bugfix] 修复无法记录日志的bug	7 years ago
ibuler	76df1de634	[Bugfix] 修复一些明显的bug	7 years ago
ibuler	5a92972120	[Bugfix] 修复ops一些功能的bug	7 years ago
ibuler	3f89701b84	[Bugfix] 修复授权和资产的一部分bug	7 years ago
ibuler	b0eace6ad8	[Bugfix] 基本完成assets模块	7 years ago
ibuler	b4e1ac1953	[Bugfix] 修复资产模块中一些bug	7 years ago
ibuler	a308000d2e	[Bugfix] 修改users模块一些bug	7 years ago
ibuler	e1163895e2	[Update] 系统用户api允许app user获取	7 years ago
ibuler	1b6fd4d13a	[Bugfix] 修改普通用户获取资产详情的bug	7 years ago
ibuler	0f64d39cc5	Merge branch 'new_api' of github.com:jumpserver/jumpserver into new_api	7 years ago
ibuler	5e1eff19b7	[Change] Add terminal migrations force	7 years ago
ibuler	6cee62696c	[Feature] 翻译，并增加设置导航	7 years ago
ibuler	11fa3e08e9	[Bugfix] 修改ts_to_date bug	7 years ago
ibuler	2d0be8f996	[git status	7 years ago
ibuler	b97d5b0960	[Feature] assets task 修改	7 years ago
ibuler	08e1788426	[Feature] 打算拆分下载和上传为独立模块，时间有限暂时放弃	7 years ago
ibuler	160b01ec12	Merge branch 'new_api' into ops	7 years ago
ibuler	17ddb3bbbd	[Feture] 使用信号解耦	7 years ago
liuzheng712	ef1bbc29b5	fix: update the terminal app	7 years ago
ibuler	ffa7e58025	[Bugfix] Terminal status报异常	7 years ago
ibuler	18fbfb449d	[Feature] 修改url pattern 精确匹配uuid	7 years ago
ibuler	cb57002682	[Change] 去掉前端html中的hardcode 99991937	7 years ago
ibuler	722863428d	[Feature] 添加context_processor	7 years ago
ibuler	99b4c66b5e	[Feature] 添加signals 解耦代码	7 years ago
ibuler	cbc000696e	[Feature] 修改adminuser systemuser cluster及他们的关系	7 years ago
ibuler	0c9e24dc59	[Feture] 添加ops 页面	7 years ago
ibuler	18fd04d63c	[Stash] Test case 通不过，import error	7 years ago
ibuler	27a1849b1d	[Change] 修改idc => cluster	7 years ago
ibuler	32fd9bb42f	Merge branch 'new_api' into ops	7 years ago
ibuler	15f6d5c9c0	[Bugfix] terminal tasks main()运行时，可能数据库还不存在	7 years ago
ibuler	2b3551f1fc	[Feature] 修改ansible和ops	7 years ago
ibuler	e57121a780	[Feature] 优化Ops ansible api	7 years ago
ibuler	ec8106e43d	[Feature] 完成登陆日志	7 years ago
ibuler	a5f9735906	[Update] 更新index view	7 years ago
ibuler	71a3079221	[Feature] 离线session完成	7 years ago
ibuler	9b6696bb6e	[Feture] session detail页面，包含命令列表	7 years ago
ibuler	01558c985a	[Feture] 添加session 列表，并支持kill session	7 years ago
ibuler	bf8fa95597	[Update] 修改session	7 years ago
ibuler	94462bddb3	[Bugfix] 修改api view name	7 years ago
ibuler	1920a0f03d	[Bugfix] 修改nav小bug	7 years ago
ibuler	f74422e4bb	[Bugfix] 更改application models后导致 terminalstatus报错	7 years ago
ibuler	3120cef335	[Change] 修改导航列表	7 years ago
ibuler	61a8d95f46	[Change] Rename applications -> terminal	7 years ago
ibuler	19051d36dc	[Update] 修改一些bug	7 years ago
ibuler	7910292e0f	[Feature] 修改命令上传api	7 years ago
ibuler	26607bc327	[Copyright] 修改copyrite	7 years ago
ibuler	e7f38ec894	[Change] 全部使用uuid作为主键	7 years ago
ibuler	d80cbe270a	[Update] 修改用户获取自己授权资产的api，和查询用户授权资产组等api的Url和结构	7 years ago
ibuler	818ead85ca	[Feature] 增加上传replay log的api	7 years ago
ibuler	7f9ce57318	修改 terminal上报接口和api	7 years ago
ibuler	3639b190e3	Update perm api	7 years ago
ibuler	034f0a02b1	Update terminal api	7 years ago
ibuler	30c4fc9514	App user get user perms	7 years ago
ibuler	91601cce9e	[Feature] Support multiple ou search	7 years ago
ibuler	a4fa15a7de	Update logging	7 years ago
ibuler	d4ed6a97a5	[Bugfix] Update jumpserver settings	7 years ago
ibuler	0db8482873	Update ldap auth	7 years ago
ibuler	8bccaa6ee2	Update issue template	7 years ago
ibuler	2ae3bec335	[Bugfix] Change user public key length to 5000, fixed #631	7 years ago
ibuler	da5b9be5ca	[Bugfix] Update some translation and set warning, partial fix #646	7 years ago
ibuler	d1fbbd3213	[Bugfix] Push system user have not result may be error, fixed #701	7 years ago
ibuler	688a836bbe	[Copywriting] Copywriting change fixes #733	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
管宜尧	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
ibuler	e6537699fd	[Bugfix] Update asset create template bug	7 years ago
老广	1d950c4f49	Update settings.py	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
本杰明	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	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
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	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