2545 Commits

Author	SHA1	Message	Date
BaiJiangJie	8f347eee4d	Merge pull request #4216 from jumpserver/dev_org ... feat(Cloud): 组织管理ViewSet添加搜索字段	2020-07-01 14:57:50 +08:00
Bai	caf312c5be	feat(Cloud): 组织管理ViewSet添加搜索字段	2020-07-01 14:38:03 +08:00
Bai	ac6168a06c	feat(Command execute): 批量命令执行配置添加默认值True	2020-07-01 11:19:57 +08:00
Bai	b46e772d09	feat(login password ecrypt): 登录密码加密传输 4	2020-06-30 18:35:01 +08:00
Bai	183df82a75	feat(login password ecrypt): 登录密码加密传输 3	2020-06-30 18:14:53 +08:00
Bai	98c91d0f18	feat(login password ecrypt): 登录密码加密传输（添加翻译）	2020-06-30 17:37:16 +08:00
Bai	e17d875206	feat(login password ecrypt): 登录密码加密传输2	2020-06-30 17:23:56 +08:00
Bai	4b1e84ed8a	Merge branch 'dev' into dev_login_password_encrypt	2020-06-30 17:13:08 +08:00
Bai	71ee33e3be	feat(login password ecrypt): 登录密码加密传输	2020-06-30 17:12:38 +08:00
xinwen	2b6e818943	[Update] 限制上传CSV文件的大小	2020-06-28 19:02:20 +08:00
xinwen	6e3369c944	[Update] sftp log页面操作翻译	2020-06-24 17:22:53 +08:00
Bai	c0a153d13a	[Update] UserProfileAPI 判断是否设置session过期时间，解决前端关闭浏览器session未失效的问题	2020-06-24 10:52:05 +08:00
Bai	64064cb526	[Update] 注释节点树print	2020-06-17 17:47:45 +08:00
Eric_Lee	46941037dd	add SECURITY_COMMAND_EXECUTION (#4114)	2020-06-17 15:03:41 +08:00
xinwen	8ad71b6dd9	[Update] Move LOCAL_DYNAMIC_SETTINGS (#4113)	2020-06-16 18:11:23 +08:00
ibuler	220ccda04d	fix: 修改domain创建的assets不是必填的	2020-06-16 17:55:18 +08:00
Eric_Lee	6d30fe797c	fix ldap test bug (#4110)	2020-06-16 17:25:57 +08:00
xinwen	3318df1771	[Fix] 日志审计/FTP日志 (#4109)	2020-06-16 16:33:53 +08:00
Eric_Lee	0ccd806eca	add system user perm api (#4108)	2020-06-16 16:12:59 +08:00
xinwen	7ebe1c2916	[Update] 优化 dynamic settings (#4107)	2020-06-16 15:54:19 +08:00
ibuler	08904c2a9f	Merge branch 'dev' of github.com:jumpserver/jumpserver into dev	2020-06-16 15:30:39 +08:00
ibuler	19e34270d1	feat: gather user添加搜索字段	2020-06-16 15:30:25 +08:00
Bai	afa515d570	Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev	2020-06-16 15:04:38 +08:00
Bai	bcba408517	[Update] 修改用户source默认local	2020-06-16 15:04:01 +08:00
ibuler	80d94074e7	feat: 修改资产的标签搜索	2020-06-16 14:56:19 +08:00
ibuler	9347405f08	feat: terminal增加搜索	2020-06-16 13:50:21 +08:00
ibuler	da4ad11a69	fix: 修改session command 翻译	2020-06-16 13:39:49 +08:00
ibuler	b81e424e80	fix: 修改翻译	2020-06-16 12:20:16 +08:00
ibuler	1f15937139	feat: 修改翻译，添加settings	2020-06-16 11:04:59 +08:00
Bai	f4fa011714	[Update] 修改mfa校验code无效翻译	2020-06-15 20:31:50 +08:00
xinwen	c5a9a85818	[Update] 完善 作业中心/任务列表 (#4105)	2020-06-15 19:42:36 +08:00
ibuler	e23bfa0f69	Merge branch 'dev' of github.com:jumpserver/jumpserver into dev	2020-06-15 17:55:13 +08:00
ibuler	451690fe8b	fix: 修改重定向	2020-06-15 17:44:40 +08:00
Eric_Lee	5bea782b9f	add assignee field for ticket (#4104)	2020-06-15 17:24:05 +08:00
Bai	f26f7ca1e7	[Update] 修改parsers，处理dict字段值；解决remote-app csv导入时异常	2020-06-15 16:34:51 +08:00
Bai	583d295fd1	Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev	2020-06-15 13:50:05 +08:00
Bai	b51af1f7d7	[Update] 修改MFA应用下载图片	2020-06-15 13:49:51 +08:00
xinwen	edcf9921fe	[Update] apps/assets/serializers/system_user.py (#4102)	2020-06-15 13:24:52 +08:00
Eric_Lee	eef172d0e2	Merge pull request #4098 from jumpserver/fix-ops-adhoc ... [Fix] ops.models.adhoc (#4096)	2020-06-12 12:23:05 +08:00
Eric_Lee	5b407fe8bc	Merge pull request #4095 from jumpserver/update-user ... [Update] 修改 用户相关 Serializer	2020-06-12 12:22:16 +08:00
Bai	1bb9048910	[Update] 标签序列类assets字段required为False	2020-06-12 11:45:03 +08:00
xinwen	787cdbcadf	[Fix] ops.models.adhoc (#4096)	2020-06-12 11:44:29 +08:00
xinwen	b14ca14120	[Fix] ops.models.adhoc (#4096)	2020-06-11 20:30:59 +08:00
ibuler	4b2fd0d0da	fix: 修复系统用户过滤权限规则的bug	2020-06-11 19:36:34 +08:00
xinwen	3393f18399	[Update] 修改 用户相关 Serializer	2020-06-11 18:24:56 +08:00
ibuler	7e1a379e47	feat: 修改org返回的数据结构	2020-06-11 18:05:18 +08:00
ibuler	213fdd461b	fix: 修改翻译	2020-06-11 14:33:42 +08:00
ibuler	148c7ffb43	fix: 添加注释	2020-06-11 14:10:55 +08:00
ibuler	75be45ce43	feat: 使用新的对称加密方式: aes	2020-06-11 12:10:00 +08:00
ibuler	04eb670ada	Merge branch 'dev' of github.com:jumpserver/jumpserver into dev	2020-06-11 11:29:28 +08:00