github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
5,130 Commits
70 Branches
249 Tags
114 MiB
Commit Graph

5130 Commits (b1f5cc7728a9cf7c0e5484eb63fa927f7a948af0)

Author SHA1 Message Date
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
ibuler 331cfe2aed [Bugfix] 修复节点数量缓存显示不对的bug 2020-05-08 15:53:58 +08:00
Bai e48dbabef2 [Update] 修改翻译 2020-05-08 15:50:01 +08:00
Bai 181973f235 [Update] 优化仪表盘页面加载 2020-05-08 15:41:56 +08:00
ibuler 440a2ad241 Merge branch 'PERM_CACHE_CONFIG' into dev 2020-05-08 14:25:36 +08:00
ibuler 1936a6d5ee [Update] 去掉perms cache enable settings 2020-05-08 14:25:28 +08:00
老广 4517a92b2b
Merge pull request #3971 from jumpserver/add-ftp-log-api 
[Add] ftp-logs api
 2020-05-08 00:52:03 -05:00
ibuler 44a2a51f59 Merge branch 'PERM_CACHE_CONFIG' into dev 2020-05-08 13:13:47 +08:00
ibuler 2d4498578a [Update] 修改授权缓存配置的默认值 2020-05-08 13:13:38 +08:00
xinwen ac902501ec [Add] ftp-logs api 2020-05-08 12:46:18 +08:00
老广 363b5d04d9
Merge pull request #3969 from jumpserver/update-login-logs 
[Update] login-logs api 添加 `mfa_display`
 2020-05-07 22:23:37 -05:00
xinwen dec89ae5ee [Update] login-logs api 添加 `mfa_display` 2020-05-08 10:08:57 +08:00
老广 5d37269a6c
Merge pull request #3967 from jumpserver/lina_status_code 
[Update] Reponse status code from 401 to 400
 2020-05-07 04:03:34 -05:00
Eric 9a39ccd37d [Update] Reponse status code from 401 to 400 2020-05-07 16:57:57 +08:00