2431 Commits

Author	SHA1	Message	Date
Bai	3b8a24eeb7	[Update] 添加用户profile public-key序列类	2020-05-28 17:47:18 +08:00
Bai	3e5d949610	[Update] 添加用户profile password序列类	2020-05-28 16:10:28 +08:00
Bai	25c3691f6b	Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina	2020-05-28 15:03:07 +08:00
Bai	f3bc6c0b22	[Update] 修改用户profile序列类	2020-05-28 15:02:53 +08:00
ibuler	caf0d85939	[feat] 修改remote app, database app的过滤参数	2020-05-28 14:47:30 +08:00
ibuler	a463f632e8	[Update] 优化重定向	2020-05-27 20:33:09 +08:00
ibuler	a0e6d09770	Merge branch 'lina' of github.com:jumpserver/jumpserver into lina	2020-05-27 19:51:45 +08:00
Bai	7afff5e392	[Update] merge from dev to lina	2020-05-27 18:44:12 +08:00
ibuler	9a5fee5a4c	Merge branch 'lina' of github.com:jumpserver/jumpserver into lina	2020-05-27 18:03:14 +08:00
ibuler	a840e611cd	[Update] 修改core 的base url	2020-05-27 18:02:18 +08:00
Bai	566419cac4	Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina	2020-05-27 17:27:38 +08:00
Bai	7b362bfc76	[Update] 用户序列类添加mfa相关字段	2020-05-27 17:27:28 +08:00
ibuler	f528dd4888	Merge branch 'lina' of github.com:jumpserver/jumpserver into lina	2020-05-26 19:00:00 +08:00
ibuler	3c95c6fe11	[Feat] 添加失效用户权限的api	2020-05-26 18:56:03 +08:00
老广	71a72dd957	Merge pull request #4033 from jumpserver/update-i18n ... [Update] i18n	2020-05-25 01:53:02 -05:00
xinwen	93453cc8c3	[Update] perms.serializers.asset_permission.AssetPermissionSerializer 添加字段	2020-05-25 14:50:07 +08:00
xinwen	11527b9033	[Update] i18n	2020-05-22 18:18:40 +08:00
ibuler	2ff2266417	[Update] 修改 SerializerMixin 还原之前的更改	2020-05-21 20:35:44 +08:00
ibuler	3320e6105c	[Update] 删掉没用的内容	2020-05-21 19:00:47 +08:00
xinwen	492b1c4311	[Update] org retrieve api	2020-05-21 16:09:42 +08:00
xinwen	7b0993959e	[Update] orgs.serializers.OrgReadSerializer add id	2020-05-21 15:40:41 +08:00
ibuler	701582fe38	[Update] 修改license的判断方法	2020-05-21 14:47:00 +08:00
ibuler	b371676813	Merge branch 'lina' of github.com:jumpserver/jumpserver into lina	2020-05-20 19:35:48 +08:00
Bai	2e0eab9289	[Update] 修改翻译信息	2020-05-20 19:35:35 +08:00
ibuler	0cac8d66b3	[Update] 修改index api	2020-05-20 19:35:33 +08:00
Bai	7c44f74068	[Bugfix] 修复只显示当前节点下资产不生效的问题	2020-05-20 18:20:01 +08:00
xinwen	245d28b03d	[Update] 一些本地化	2020-05-20 17:45:50 +08:00
Bai	75f4f6d0a2	[Update] 资产授权序列类is_expired, is_valid设置为read_only	2020-05-19 20:50:33 +08:00
Bai	f9e167cb0e	Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina	2020-05-19 20:36:41 +08:00
Bai	f224e49de7	[Update] 去掉资产授权序列类中不存在的字段	2020-05-19 20:36:17 +08:00
Bai	63ff868553	[Update] 授权资产树返回org_id字段值	2020-05-19 19:36:19 +08:00
Bai	b97deec1de	[Update] openid 继续使用配置项 base_site_url	2020-05-19 18:24:26 +08:00
Bai	be3fdac8a9	[Update] 修复API-key不能删除的问题	2020-05-19 15:28:31 +08:00
Bai	96afd82341	[Update] 修复任务列表，执行历史中stat汇总数据显示问题	2020-05-19 15:15:17 +08:00
Bai	728e4b7edd	[Update] 修复授权模块的信号处理监听不到的问题	2020-05-19 11:47:49 +08:00
Bai	73c3de97b8	[Update] 取消用户资产页面中，资产详情系统用户值为undefine的问题	2020-05-18 18:14:19 +08:00
Bai	e98626988b	[Update] 解决开启OpenID，为用户强制启用MFA导致，登录时报错的问题	2020-05-18 18:02:37 +08:00
Bai	01a52812f0	[Update] 修改用户MFA禁用/更新的View	2020-05-18 15:49:53 +08:00
Bai	041d99f0be	[Update] 更新remote-app用户/用户组时自动刷新页面	2020-05-18 15:40:54 +08:00
Bai	75edc26a10	[Update] 修改翻译，禁用资产提示不支持ansible的错误提示	2020-05-18 15:25:24 +08:00
Bai	2f7b169405	[Update] 修改授权用户/用户组页面删除用户组失败的问题	2020-05-18 15:24:55 +08:00
ibuler	76ef9b292b	[Update] 修改public api	2020-05-18 14:55:16 +08:00
ibuler	1540cbdcaa	[Update] 修改csv render	2020-05-18 11:52:50 +08:00
Bai	e951b64b0a	[Update] 修改版本号1.5.9	2020-05-14 16:14:17 +08:00
ibuler	5d129fd0da	Merge branch 'lina' of github.com:jumpserver/jumpserver into lina	2020-05-14 14:51:05 +08:00
ibuler	b529127461	[Update] 修改user role	2020-05-14 14:49:54 +08:00
Bai	d878089ebd	[Update] 用户资产详情Modal添加comment	2020-05-14 14:26:00 +08:00
Bai	4658a4c90f	[Update] 修改向导文案	2020-05-14 11:00:24 +08:00
Bai	d06ea2944e	[Update] 修改Dashboard API	2020-05-14 10:53:30 +08:00
ibuler	154aad1e22	Merge branch 'lina' of github.com:jumpserver/jumpserver into lina	2020-05-13 11:06:24 +08:00