731 Commits

Author	SHA1	Message	Date
ibuler	1f15937139	feat: 修改翻译，添加settings	2020-06-16 11:04:59 +08:00
Bai	b51af1f7d7	[Update] 修改MFA应用下载图片	2020-06-15 13:49:51 +08:00
xinwen	3393f18399	[Update] 修改 用户相关 Serializer	2020-06-11 18:24:56 +08:00
xinwen	7ef09a4ca1	[Update] UserSerializer 添加 login_confirm_settings (#4086)	2020-06-08 17:16:30 +08:00
ibuler	71202e83f5	feat: 修改用户的api	2020-06-05 20:15:23 +08:00
Bai	5730e60089	[Update] 修改用户profile序列类	2020-06-04 17:24:31 +08:00
Bai	afc7f3bb9c	[Update] 修改用户public_key生成密钥的view	2020-06-04 17:05:36 +08:00
Bai	403b6fc563	[Update] 修改用户更新Public_key的条件判断	2020-06-04 17:02:43 +08:00
Bai	9b2c5cb305	[Update] 修改用户profile序列类3	2020-06-03 21:00:37 +08:00
Bai	907f0068db	[Update] 修改用户profile序列类2	2020-06-03 20:21:28 +08:00
Bai	a16b3260ba	Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev	2020-06-03 18:20:43 +08:00
Bai	1845821f6c	[Update] 修改用户profile序列类	2020-06-03 18:20:33 +08:00
ibuler	27d906a877	feat: 去掉js i18n catalog	2020-06-03 16:26:10 +08:00
ibuler	5bacab7475	fix: 重置密钥到auth中	2020-06-03 12:44:45 +08:00
ibuler	999286a089	fix: 修复用户公钥错误引起的profile bug	2020-06-03 12:32:52 +08:00
ibuler	68ccaf0cb3	feat: 去掉第一次登录的那个导航	2020-06-03 12:26:53 +08:00
ibuler	8d58d58519	feat: 修改profile view	2020-06-03 11:58:16 +08:00
ibuler	8efc0331de	feat: 删掉所有view, templates, forms	2020-06-03 11:43:43 +08:00
ibuler	96551856a2	[Update] 部分view放到auth中	2020-06-03 11:06:44 +08:00
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	f3bc6c0b22	[Update] 修改用户profile序列类	2020-05-28 15:02:53 +08:00
Bai	7afff5e392	[Update] merge from dev to lina	2020-05-27 18:44:12 +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	3c95c6fe11	[Feat] 添加失效用户权限的api	2020-05-26 18:56:03 +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
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
ibuler	76ef9b292b	[Update] 修改public api	2020-05-18 14:55:16 +08:00
ibuler	b529127461	[Update] 修改user role	2020-05-14 14:49:54 +08:00
ibuler	17163dd909	[Update] 用户Profile添加在当前组织的角色	2020-05-13 11:05:58 +08:00
ibuler	195cbbbe42	[Update] 修改profile serialzier	2020-05-12 17:57:35 +08:00
ibuler	dd5bf546df	[Update] 修改serialzier_class	2020-05-12 15:37:37 +08:00
Bai	4bd2681bf0	[Update] Merge from dev to lina	2020-05-11 17:43:48 +08:00
Bai	98e3adbb11	[Update] Merge from master to dev	2020-05-11 17:38:01 +08:00
Bai	7b3647e78a	[Bugfix] 修复用户页面更新MFA时解除管理员强制启用的Bug	2020-05-11 16:56:52 +08:00
Bai	0cff6ab29b	[Update] Merge fromo dev to lina	2020-05-11 14:03:24 +08:00
ibuler	0bdc425c55	Merge branch 'lina' of github.com:jumpserver/jumpserver into lina	2020-05-09 14:51:47 +08:00
ibuler	0a7f63cc5e	[Update] 修改remote app api	2020-05-09 14:51:19 +08:00
xinwen	3ee051303a	[Update] audits 模块为一些 models 字段添加 verbose 信息	2020-05-09 11:29:25 +08:00
Bai	185c53d311	[Update] Merge from master to dev	2020-05-08 16:40:07 +08:00
Bai	aec78dc3c7	[Update] 添加组织详情->组织用户tab页，解决组织详情页面加载超时问题	2020-05-06 15:31:08 +08:00
ibuler	6bb13a26f5	[Update] 修改用户serializer	2020-04-30 16:58:08 +08:00
ibuler	f8c323cf5c	[Update] 优化user group serializer	2020-04-29 16:01:14 +08:00
ibuler	b6f5b335bd	Merge branch 'api_perf' into lina	2020-04-29 15:47:46 +08:00
ibuler	230d6137f3	Merge branch 'lina' of github.com:jumpserver/jumpserver into lina	2020-04-29 10:21:06 +08:00
ibuler	aa9533eb5b	[Update] Groups users字段可以显示	2020-04-29 10:19:25 +08:00
Bai	9eee79f7d4	[Update] 调整openid backend顺序；openid 用户创建/更新添加日志输出	2020-04-29 00:43:54 +08:00