620 Commits (fc58906bce535f9f3af6fa91539f9ac8b4d6c075)

Author	SHA1	Message	Date
ibuler	9b4b9e6900	[Update] 发送邮件增加用户名显示	7 years ago
ibuler	4b7af1457d	[Update] 系统用户新增清除认证的操作	7 years ago
BaiJiangjie	2583c0b26c	[Bugfix] 资产树节点，取消model value unique，并添加唯一性校验，修改新增节点计数器规则	7 years ago
BaiJiangjie	0962a16b22	[Bugfix] 修复首次登录条款问题及引导页面MFA配置问题	7 years ago
BaiJiangjie	c37414045b	[Bugfix] 修改用户列表导出，默认导出全部用户	7 years ago
BaiJiangjie	784bec42ff	[Update] 修改用户登录,首次登录不需要验证码,登录失败时需要验证码校验	7 years ago
BaiJiangjie	b5fc76d6a5	[Update] 修改用户首次登录页	7 years ago
BaiJiangjie	5b52b907c0	[Update] 创建用户，更新用户，添加MFA设置选项	7 years ago
BaiJiangjie	8447c6f487	[Update] 修改coco文案OTP改为MFA	7 years ago
BaiJiangjie	7a219e1710	[Update] OTP文案修改为MFA	7 years ago
ibuler	9ac7f26c74	[Update] 修改用户详情，自己更改自己otp，提示小写	7 years ago
BaiJiangjie	f73fe1f315	[Bugfix] 修复用户登录缓存设置问题	7 years ago
BaiJiangjie	12c8cf6b76	[Update] 添加OTP认证功能	7 years ago
BaiJiangjie	f450accbf8	[Merge] with dev	7 years ago
BaiJiangjie	0bbfc7433d	[Feature] 支持otp	7 years ago
ibuler	48e8785725	[Update] 修改users otp secret key	7 years ago
ibuler	2398e9acbd	更改表截稿	7 years ago
ibuler	8b3b517bab	[Update] 修改授权规则详情列表页面	7 years ago
ibuler	bbaa35c773	[Update] 修改Perms	7 years ago
ibuler	0fa8287811	Merge branch 'dev' into perms	7 years ago
ibuler	78f4e5a89a	[Update] 修改用户Opt	7 years ago
ibuler	3193c5549d	Merge remote-tracking branch 'github/dev' into dev	7 years ago
ibuler	ed71e7d2d9	[Update] 修改用户Opt	7 years ago
ibuler	84634eb8c0	[Update] 修改Permr认证	7 years ago
ibuler	a4ff2181c5	[Update] 修改用户view的api	7 years ago
ibuler	fffa0def9e	[Update] 修改api和view	7 years ago
ibuler	d0ede246e7	[Update] 修改授权	7 years ago
BaiJiangJie	b8b78ffeb2	Merge pull request #1162 from BaiJiangJie/dev ... 创建用户发送邮件	7 years ago
ibuler	6a88fd2d60	[Update] 修改api权限	7 years ago
BaiJiangjie	b63999f385	创建用户发送邮件	7 years ago
BaiJiangjie	ec6103448e	使终端管理的应用用户不显示在用户组里	7 years ago
ibuler	b959f1f68b	Merge branch 'bugfix_ip_lookup' into dev	7 years ago
ibuler	e1cab35db0	[Bugfix] 修改获取城市	7 years ago
ibuler	5f0b4a4b63	[Update] 修改一些翻译	7 years ago
ibuler	c5af4d47eb	Merge branch 'some_auth_api' into dev	7 years ago
ibuler	c37bfb682a	[Update] 添加设置认证api和创建用户时可以不选择组	7 years ago
ibuler	f85e5b6f75	[Bugfix] 修改添加用户的bug	7 years ago
ibuler	759760e7d9	[Update] 服务器可以生成用户密钥	7 years ago
ibuler	faf6a7b623	[Update] 删掉token api调用次数限制	7 years ago
ibuler	8e4ab9f3a9	[Update] 支持获取token的用户	7 years ago
ibuler	fe03011177	[Update] 不允许添加应用程序类型的用户	7 years ago
liuzheng712	9162f4a226	revert: add the old apps/users/migrations/0002_auto_20171225_1157.py	7 years ago
fit2cloud-fengyi	094e862abf	fix bug	7 years ago
fit2cloud-fengyi	8e09151a02	Merge branch 'docs' of https://github.com/jumpserver/jumpserver into docs	7 years ago
fit2cloud-fengyi	18841d6c21	add ignore	7 years ago
ibuler	d3e77b09ef	[Merge] with doc	7 years ago
ibuler	86c0a2d28b	[Update] 修改部分翻译和文档	7 years ago
ibuler	e123599735	[Update] 修改一些bug和文案	7 years ago
ibuler	bd4f96134f	[Update] 修改一些文案	7 years ago
ibuler	d284c2175d	[Update] 修改一些小问题	7 years ago
ibuler	1018deda96	[Update] 支持拖拽更新	7 years ago
ibuler	5a0068d86a	[Update] 修改文案	7 years ago
ibuler	31629fc975	[Bugfix] 修复资产禁用还可以登录	7 years ago
ibuler	521a5c57a2	[Update] 统一copyright	7 years ago
ibuler	870b863136	[Update] 修改设置的一些require	7 years ago
ibuler	9292e48554	[Bugfix] 用户csv导入编码问题	7 years ago
ibuler	c68da5898a	[Update] 修改初始	7 years ago
ibuler	08edda35e1	[Update] 完成资产书	7 years ago
ibuler	c8728cace4	[Update] 完成树形改造	7 years ago
ibuler	c7296c2498	[Update] 修改系统用户推送，拆分assets的部分模块	7 years ago
ibuler	f82d939d15	[Update] 使用资产树，去掉集群和资产组	7 years ago
ibuler	bd4768c147	[Update] 拆分asset api module	7 years ago
ibuler	2d3967872b	[Feature] 完成资产授权和资产添加	7 years ago
ibuler	9e09a962af	[Feature] 支持popover	7 years ago
ibuler	012614562f	[Update] 修改小bug	7 years ago
ibuler	6d552f4680	[Feature] 添加链接token	7 years ago
ibuler	f0b9a11482	[Update] ansible disk bug	7 years ago
ibuler	b0fab2453a	[Merge] 合并标签功能	7 years ago
ibuler	d74c2e8466	[Model] 修改create_by字段	7 years ago
ibuler	f37b331630	Merge with dev	7 years ago
ibuler	9dbf498322	[Update] 修改copyright	7 years ago
ibuler	8e6efac6db	[Update] 修改copyrite	7 years ago
ibuler	579e74dd5d	[Bugfix] 修复一些bug	7 years ago
ibuler	f40fbaf602	[Feature] 添加修改用户密码api	7 years ago
ibuler	968b395bce	Merge branch 'es' into dev	7 years ago
ibuler	0a931bbf77	[Feature] es support	7 years ago
ibuler	57e508f331	[update] 修改用户创建时 姓名和用户名的位置	7 years ago
ibuler	681ddb5af2	[Bugfix] for login ip	7 years ago
ibuler	29061aa088	[Bugfix] user login ip	7 years ago
ibuler	b2f97a263d	[Feature] 添加后端paging	7 years ago
ibuler	59a69f0253	[Bugfix] 修复title显示Jumpserver	7 years ago
ibuler	39fff235d1	[Bugfix] 修复cluster创建的bug	7 years ago
ibuler	abb1a40a4f	[Feature] 添加basic settings	7 years ago
ibuler	121f56f44b	[Feature] 添加setting页面	7 years ago
ibuler	3223d3b74d	[Bugfix] 修复了一些显示上的bug	7 years ago
ibuler	b2b123b41e	[Bugfix] 用户添加报错	7 years ago
ibuler	7e23d2c234	[Bugfix] 修复重置密码bug	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	07a70311df	[Bugfix] 修复以下bug ... - 删除用户报错，上次更新带来的 - 管理员用户页面会看到所有主机的，而不是授权给自己的 - 授权详情页面 资产显示无效	7 years ago
ibuler	9a6bc9fec5	[Update] session添加登陆ip	7 years ago
ibuler	1888c698f1	[Bugfix] 修复一些bug	7 years ago
ibuler	28223421b1	[Bugfix] 修复一下bug ... 1. 添加管理用户时同名的异常 2. 添加授权规则的检查	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	a755882100	[Bugfix] 修复打印中文报错异常	7 years ago
ibuler	e0a3fafbd5	[Bugfix] 详见trello	7 years ago
ibuler	158678c2db	[Bugfix] 修改bug，显示cluster	7 years ago
ibuler	e20444983d	[Bugfix] 修改html bug	7 years ago
ibuler	1c20f519a9	[Bugfix] 修改小的bug	7 years ago
ibuler	0848893f1e	[Bugfix] 修复时间日期搜索的bug，select2模块自适应长度	7 years ago
ibuler	22b7b84a45	[Update] 修改创建默认集群，组等名称为Default	7 years ago
ibuler	6a6d0cf279	[Update] Change user model	7 years ago
ibuler	f4beccddae	[Update] 修改注册流程	7 years ago
ibuler	d0ef1e715e	[Add] Add initial migrations	7 years ago
ibuler	bf9bb1b973	[Update] 修改ops 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	e1b23a7cb4	[Bugfix] 修复无法记录日志的bug	7 years ago
ibuler	76df1de634	[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	08e1788426	[Feature] 打算拆分下载和上传为独立模块，时间有限暂时放弃	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	18fd04d63c	[Stash] Test case 通不过，import error	7 years ago
ibuler	ec8106e43d	[Feature] 完成登陆日志	7 years ago
ibuler	a5f9735906	[Update] 更新index view	7 years ago
ibuler	61a8d95f46	[Change] Rename applications -> terminal	7 years ago
ibuler	19051d36dc	[Update] 修改一些bug	7 years ago
ibuler	26607bc327	[Copyright] 修改copyrite	7 years ago
ibuler	e7f38ec894	[Change] 全部使用uuid作为主键	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	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
管宜尧	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	cd1d690fd3	[Bugfix] 修复一些bug	7 years ago
中国娃	67e953902b	Update utils.py (#579)	7 years ago
ibuler	1c78526f86	Fix bug	7 years ago
ibuler	d012880a90	[Bugfix] 修复bug	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
ibuler	4e67749eef	[Docs] 添加api dockers	7 years ago
ibuler	29095a869c	[Demo] update demo mode code	8 years ago
njqaaa	9b14244363	fix id_dsa check error (#458) ... * fix id_dsa check error * fix 邮件修改密码 token错误 * fix 3c8aec9 add )	8 years ago
Caijun	cf07a6ebb7	Fix judging request.user valid on UserToken API (#476)	8 years ago
ibuler	41633be1aa	[Bugfix] 修复无法删除资产组	8 years ago
ibuler	d2620a655c	[Bugfix] 修复模板bug, 修复getattr bug	8 years ago
ibuler	edc631ad60	[Docker] 添加Docker compose	8 years ago
GuangHongwei	458989328e	[Bugfix] 修改bug，使用py3编程	8 years ago
ibuler	2ec0ab871a	Fix form bug	8 years ago
ibuler	695e4da85e	[Fixture] 完成批量更新	8 years ago
ibuler	071d1922d0	stash it	8 years ago
ibuler	95e64d7809	[Change] 修改导出和更新逻辑	8 years ago
ibuler	5418d0b44c	[Change] Using csv replace xlsx	8 years ago
ibuler	bcc065eb8f	[Compat] compat py3 change bootstrap form to bootstrap3	8 years ago
ibuler	a320b9e05e	[Bugfix] 兼容py3	8 years ago
ibuler	c11374ae39	[Bugfix] 修改翻译	8 years ago
ibuler	92ebe85a3f	[Fixture] 详情页添加system user 推送	8 years ago
ibuler	ac3553babb	[Fixture] 修改asset detail	8 years ago
ibuler	709552f14c	[Fixture] 添加首页	8 years ago
ibuler	66a2262ee9	[Fixture] 增加 asset groups assets api	8 years ago
ibuler	067426d5e0	[Fixture] 完成用户向导页	8 years ago
ibuler	7720e9f3fd	[Change] 修改图片	8 years ago
ibuler	61a481f427	[Fixture] 添加用户连接终端	8 years ago
ibuler	3fa5ce5404	[Fixture] 添加用户信息更改	8 years ago
ibuler	0983f294b7	[Fixture] 添加用户profile	8 years ago
ibuler	4e7b665ea8	[Change] 添加翻译，并添加用户登陆页面	8 years ago
ibuler	ab62bfca7e	[Bugfix] 修改一些bug	8 years ago
ibuler	695dc96ce8	Merge branch 'audits'	8 years ago
ibuler	9518672ad2	Add	8 years ago
ibuler	b055144908	Merge with audits	8 years ago
xiaokong1937@gmail.com	548d7ef99a	fix #13;fix `user` context conflict problem in user-detail page	8 years ago
ibuler	a79c3dd156	[Fixture] 添加command log backends, 未来支持es	8 years ago
xiaokong1937@gmail.com	fe01f92545	user profile: update ssh pk	8 years ago
xiaokong1937@gmail.com	8a5d0b2d92	remove unused templatetags: users_tags and common_tags	8 years ago
xiaokong1937@gmail.com	f3647ea46d	user-profile page	8 years ago
ibuler	0869931e67	[Bugfix] 修改了一些issue上的bug	8 years ago
ibuler	df94d11f53	[Fix] 修改一些api bug	8 years ago
ibuler	ffed28c9c7	[Change] 修改perm的代码， 强制79个字符内	8 years ago
ibuler	25cb47d2f5	[Change] 拆分user view为多个view	8 years ago
ibuler	8916221bba	[Bugfix] 紧急修复url解析失败错误	8 years ago
ibuler	17657deb0e	[Bugfix] 和Master分支合并后，修复冲突，DRF 新版本要求 fields和exclude	8 years ago
ibuler	9c6c6d6b4c	[Feature] 添加Dockerfile	8 years ago
ibuler	b670259ab6	Modify terminal reqject templatte	8 years ago
ibuler	301e02bcd8	Update some api	8 years ago
ibuler	70da177ed7	Update api	8 years ago
ibuler	92d854b971	Update api	8 years ago
ibuler	d80fec6e60	Update some api	8 years ago
ibuler	d56f030dc4	Finish terminal accept	8 years ago
ibuler	775cd523eb	Update app terminal name to applications	8 years ago
ibuler	a8fa4d2f0c	update terminal regist	8 years ago
ibuler	2707012325	Finish access key auth	8 years ago
ibuler	fe17bec752	Add access key auth	8 years ago
ibuler	5b4ce709af	Add private token and change user group	8 years ago
ibuler	875aaa0029	update user model for create application user	8 years ago
ibuler	649509dec1	Change models dir	8 years ago
ibuler	a448fd02e2	merged	8 years ago
ibuler	96d32f2e3e	prepare merge ops	8 years ago
ibuler	4d71c2d1ff	修改token获取，拆分认证文件和权限文件	8 years ago
ibuler	d964221689	Update api	8 years ago
wangjun5	87eed2e59b	add asset tool	8 years ago
ibuler	3aea994101	asset import	8 years ago
ibuler	c1c9c7b68a	update asset	8 years ago
ibuler	6e843533cb	Base finish user	8 years ago
ibuler	d8a229c09b	to Commpany	8 years ago
ibuler	72ad4b44ce	update bug	8 years ago
ibuler	c1a74aebc5	[BugFix] update some user import bug	8 years ago
ibuler	eae580e51f	Update user import and export	8 years ago
ibuler	e28f7a3bec	Add export and import	8 years ago
ibuler	be99eb82e8	udpate some bug	8 years ago
ibuler	5af97c969b	export csv	8 years ago
ibuler	7dfde3a3c5	Update	8 years ago
ibuler	180af7e0bd	Update csv	8 years ago
ibuler	e89d3b3807	Update asset	8 years ago
ibuler	aff37092bf	Rename urls	8 years ago
ibuler	5745c8cc4a	Finish url namespace change	8 years ago
ibuler	a5e487441f	prepare change api name	8 years ago
ibuler	3b30eb3278	Weiteng	8 years ago
ibuler	99c36f2a2c	Fix bug	8 years ago
ibuler	db8b0022fc	Update usergroup detail	8 years ago
ibuler	bd882c8bef	User group detail	8 years ago
ibuler	8d358a7a68	UPdate some	8 years ago
ibuler	10aa8c40a7	Add login log	8 years ago
ibuler	f70abec5ef	Finish user detail	8 years ago
ibuler	69f2bf664b	Finish user permission revoke	8 years ago
ibuler	47090eb0f7	update some user api	8 years ago
ibuler	8d7759d22f	change user api	8 years ago
ibuler	ea3f8af161	Fix pubkey auth bug	8 years ago
ibuler	a75e1db970	Add form validate	8 years ago
ibuler	072da114db	Finish system user list	8 years ago
ibuler	968b1b4cb6	Stash	8 years ago
ibuler	41337d28c3	add proxy log search	8 years ago
ibuler	53e97dac40	stash it	8 years ago
ibuler	f437d3f883	update	8 years ago
ibuler	3448f3eb0a	Modify init data	8 years ago
ibuler	34a0a37b63	Add token	8 years ago
ibuler	1159d9494c	Update signer	8 years ago
ibuler	f1dfba6a93	Update some asset issues	8 years ago
ibuler	315af35296	Finish token access api	8 years ago
ibuler	6a510dad6c	Update some bug	8 years ago
ibuler	df380c343e	Update api	8 years ago
ibuler	6164896793	Update some thing	8 years ago
ibuler	303659cb0e	Change app name apps => terrminal	8 years ago
ibuler	4531157c72	may be some wrong	8 years ago
ibuler	9960a6cd21	Plan create a new app: terminal	8 years ago
ibuler	0446f449e9	Add auth and permission backends	8 years ago
ibuler	a62a2178d0	Add user backend	8 years ago