github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
8,393 Commits
88 Branches
262 Tags
144 MiB
Commit Graph

8393 Commits (7f6d13a5a66e7d237b8a01662a46747089940b08)

Author SHA1 Message Date
BaiJiangJie 9d32285446
Merge pull request #3997 from jumpserver/dev_bai 
[Update] 修改向导文案
 2020-05-14 11:01:35 +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
wojiushixiaobai d50ea83f40 [Fix]修改文档链接 2020-05-13 15:21:04 +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 4d0f7d0254 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2020-05-12 17:57:51 +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
ibuler 0a7f63cc5e [Update] 修改remote app api 2020-05-09 14:51:19 +08:00
xinwen c6e0e9a79a [Update] 重建 ops 0018 迁移脚本 2020-05-09 14:50:22 +08:00
BaiJiangJie 4cebfc7f6a
[Update] 修改翻译 (#3981) 
* [Update] 修改翻译

* [Update] 修改翻译2
 2020-05-09 13:29:39 +08:00
老广 7fde392774
Merge pull request #3980 from jumpserver/update-audits-verbose 
[Update] audits 模块为一些 models 字段添加 verbose 信息
 2020-05-08 22:40:34 -05:00
xinwen 3ee051303a [Update] audits 模块为一些 models 字段添加 verbose 信息 2020-05-09 11:29:25 +08:00
老广 9fa31be4bf
Merge pull request #3976 from jumpserver/add-audits-apis 
[Add] audits apis
 2020-05-08 08:04:14 -05:00
老广 ae2e4049db
Merge pull request #3979 from jumpserver/lina_setting_dict_field 
AUTH_LDAP_USER_ATTR_MAP to Dict field
 2020-05-08 08:02:04 -05:00
Eric 48b71bb11b AUTH_LDAP_USER_ATTR_MAP to Dict field 2020-05-08 20:58:13 +08:00
BaiJiangJie 7e4edc3c63
Merge pull request #3978 from jumpserver/dev_index 
[Update] 修改dashboard中使用的变量名
 2020-05-08 20:03:08 +08:00
Bai 11b3c57c92 [Update] 修改dashboard中使用的变量名 2020-05-08 20:02:00 +08:00
xinwen e339ed1fb3 [Add] audits apis 2020-05-08 17:59:58 +08:00
BaiJiangJie 2d48c8028b
Merge pull request #3975 from jumpserver/dev_master 
Dev master
 2020-05-08 16:42:32 +08:00
Bai 185c53d311 [Update] Merge from master to dev 2020-05-08 16:40:07 +08:00
BaiJiangJie 2f030c02ec
Merge pull request #3973 from jumpserver/master_org 
[Update] 优化仪表盘、组织详情页
 2020-05-08 16:27:49 +08:00
老广 f4457ff1e2
Merge pull request #3972 from jumpserver/PERM_CACHE_CONFIG 
Bugfix Perm cache config
 2020-05-08 03:04:33 -05:00
ibuler c6ed6d8acb [Update] 去掉debug信息 2020-05-08 15:58:00 +08:00