5058 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
老广	78ac1968dd	Merge pull request #4039 from jumpserver/asset_permission-add-field ... [Update] perms.serializers.asset_permission.AssetPermissionSerializer…	2020-05-25 01:52:35 -05:00
xinwen	93453cc8c3	[Update] perms.serializers.asset_permission.AssetPermissionSerializer 添加字段	2020-05-25 14:50:07 +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
老广	072e74ce49	Merge pull request #4027 from jumpserver/update-org-user ... [Update] org retrieve api	2020-05-21 03:15:05 -05:00
xinwen	492b1c4311	[Update] org retrieve api	2020-05-21 16:09:42 +08:00
老广	0babada459	Merge pull request #4025 from jumpserver/update-org-user-add-id ... [Update] orgs.serializers.OrgReadSerializer add `id`	2020-05-21 02:43:35 -05: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
ibuler	0cac8d66b3	[Update] 修改index api	2020-05-20 19:35:33 +08:00
老广	3e0f5af848	Merge pull request #4019 from jumpserver/update-some-i18n ... [Update] 一些本地化	2020-05-20 05:17:12 -05: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
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
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	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
ibuler	17163dd909	[Update] 用户Profile添加在当前组织的角色	2020-05-13 11:05:58 +08:00
BaiJiangJie	b789a8bb05	Merge pull request #3994 from jumpserver/lina_assetuser ... [Update] 修复AssetUserViewSet 使用Option方法时error	2020-05-12 20:32:58 +08:00
Bai	9341ce9f84	[Update] 修复AssetUserViewSet 使用Option方法时error	2020-05-12 20:31:32 +08:00
ibuler	195cbbbe42	[Update] 修改profile serialzier	2020-05-12 17:57:35 +08:00
xinwen	6e5e340a25	Merge pull request #3993 from jumpserver/update-assets-filter ... [Update] Asset filter 添加 platform__base 字段	2020-05-12 17:26:59 +08:00
xinwen	eb74d13059	[Update] Asset filter 添加 platform__base 字段	2020-05-12 17:24:51 +08:00
老广	16f916c40a	Merge pull request #3992 from jumpserver/update-assets-filter ... Update assets filter	2020-05-12 04:11:49 -05:00
xinwen	4dd6d4498b	[Update] Asset filter 添加 platform__name 字段	2020-05-12 17:09:36 +08:00
ibuler	dd5bf546df	[Update] 修改serialzier_class	2020-05-12 15:37:37 +08:00
ibuler	d6debde566	Merge branch 'lina' of github.com:jumpserver/jumpserver into lina	2020-05-11 19:28:24 +08:00
ibuler	efc66cc7ee	[Update] 默认关闭debug	2020-05-11 19:28:02 +08:00
BaiJiangJie	b310731ba7	Merge pull request #3990 from jumpserver/lina_dev ... Lina dev	2020-05-11 17:45:51 +08:00
Bai	4bd2681bf0	[Update] Merge from dev to lina	2020-05-11 17:43:48 +08:00
BaiJiangJie	38e09753f4	Merge pull request #3989 from jumpserver/dev_master ... Dev master	2020-05-11 17:38:46 +08:00
Bai	98e3adbb11	[Update] Merge from master to dev	2020-05-11 17:38:01 +08:00
BaiJiangJie	c700b101c1	Merge pull request #3988 from jumpserver/master_otp ... [Bugfix] 修复用户页面更新MFA时解除管理员强制启用的Bug	2020-05-11 16:58:40 +08:00
Bai	7b3647e78a	[Bugfix] 修复用户页面更新MFA时解除管理员强制启用的Bug	2020-05-11 16:56:52 +08:00
BaiJiangJie	f4f042c407	Merge pull request #3987 from jumpserver/master_index ... [Update] 仪表盘缓存key添加组织id	2020-05-11 15:20:00 +08:00
Bai	0a8eeca629	[Update] 仪表盘缓存key添加组织id	2020-05-11 15:12:42 +08:00
BaiJiangJie	fdd55511a6	Merge pull request #3986 from jumpserver/lina_dev ... Lina dev	2020-05-11 14:04:52 +08:00
Bai	0cff6ab29b	[Update] Merge fromo dev to lina	2020-05-11 14:03:24 +08:00
ibuler	cda677a30f	[update] 修改remote apps的serializer	2020-05-11 12:35:33 +08:00
ibuler	5571651c02	[Update] 升级requirements	2020-05-09 16:13:06 +08:00
ibuler	2680396680	Merge branch 'lina' of github.com:jumpserver/jumpserver into lina	2020-05-09 16:08:32 +08:00
ibuler	227f97c2f5	[Update] 修改remote apps 字段	2020-05-09 16:08:09 +08:00
老广	ad3231c8a3	Merge pull request #3982 from jumpserver/update-ops-migrate ... [Update] 重建 ops 0018 迁移脚本	2020-05-09 01:54:37 -05:00
ibuler	e39d8dce3c	[Update] 修改fields	2020-05-09 14:52:44 +08:00
ibuler	0bdc425c55	Merge branch 'lina' of github.com:jumpserver/jumpserver into lina	2020-05-09 14:51:47 +08:00