github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
4,959 Commits
87 Branches
259 Tags
138 MiB
Commit Graph

4959 Commits (c6e0e9a79a08139c9c9338afafb9d3ac61cbfdc2)

Author SHA1 Message Date
xinwen c6e0e9a79a [Update] 重建 ops 0018 迁移脚本 2020-05-09 14:50:22 +08: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
xinwen e339ed1fb3 [Add] audits apis 2020-05-08 17:59:58 +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
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
ibuler 8c0bf0b71b [Update] Login log 添加display field 2020-05-06 19:35:19 +08:00
老广 5812c50a33
Merge pull request #3960 from jumpserver/lina_setting 
[Update] save settings
 2020-05-06 04:05:51 -05:00
Eric 7b339df430 [Update] save settings 2020-05-06 16:36:36 +08:00
ibuler 6bb13a26f5 [Update] 修改用户serializer 2020-04-30 16:58:08 +08:00
ibuler b92137afd9 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-04-30 16:53:21 +08:00
老广 962763dc7b
Merge pull request #3954 from xuxinwen/feature-audits-apis 
[Feature] 添加 login-logs API
 2020-04-30 03:52:57 -05:00
xuxinwen f4eca83a49 [feature] 添加 login-logs API 2020-04-30 16:40:55 +08:00
老广 02135ea04f
Merge pull request #3948 from jumpserver/settings_api 
[Update] Add settings api
 2020-04-29 18:25:10 +08:00
Eric 79eb838250 [Update] setting fields automatically generated by serializer 2020-04-29 18:10:42 +08:00
Eric 82710294f4 Merge branch 'lina' of https://github.com/jumpserver/jumpserver into settings_api 2020-04-29 17:09:50 +08:00
Eric 2d18acf6f7 [Update] settings api 2020-04-29 17:04:58 +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
Eric f451f8a979 Merge branch 'lina' of https://github.com/jumpserver/jumpserver into settings_api 2020-04-29 14:33:22 +08:00
ibuler 5c4dfabc48 [Update] 修改settings 2020-04-29 14:32:51 +08:00
ibuler 0c0c0e6d6f Merge branch 'dev' into lina 2020-04-29 13:00:47 +08:00
Eric 20cf7c7c52 [Update] Add settings api 2020-04-29 11:09:35 +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
ibuler efb5d4135a [Update] 优化api字段显示 2020-04-23 11:14:02 +08:00
ibuler 5f2c9c3801 [Update] 添加 authentication backend header 2020-04-22 15:13:04 +08:00
老广 c16a986c4b
Merge pull request #3925 from jumpserver/bugfix_many_sqlquery_perm_asset 
[Bugfix] 修复查询授权时额外查询platform的问题
 2020-04-20 16:58:14 +08:00
ibuler 44db0e8a5d [Bugfix] 修复查询授权时额外查询platform的问题 2020-04-20 16:56:47 +08:00
BaiJiangJie 1b1a686b96
Merge pull request #3922 from jumpserver/dev 
Dev
 2020-04-18 23:19:11 +08:00
BaiJiangJie 0379e5160c
[Bugfix] 修复真实组织下，新建的用户角色显示不稳定的问题2 (#3919) 
* [Bugfix] 修复真实组织下，新建的用户角色显示不稳定的问题2

* [Bugfix] 修复真实组织下，新建的用户角色显示不稳定的问题3

* [Bugfix] 修复真实组织下，新建的用户角色显示不稳定的问题4
 2020-04-18 23:14:25 +08:00
BaiJiangJie 386ce629ac
Merge pull request #3918 from jumpserver/fix_connectivity 
[Update] 修复资产页面可连接性
 2020-04-18 10:42:55 +08:00
BaiJiangJie c17dc26f8c
Merge pull request #3916 from jumpserver/dev_org 
[Bugfix] 修复真实组织下，新建的用户角色显示不稳定的问题
 2020-04-18 01:24:21 +08:00
Bai b4cc2bbff9 [Bugfix] 修复真实组织下，新建的用户角色显示不稳定的问题 2020-04-18 01:22:48 +08:00
BaiJiangJie e74289b223
[Update] 修改用户密码重置页面错误信息提示2 (#3914) 2020-04-17 23:41:50 +08:00
ibuler 98afa032a7 [Update] 修复资产页面可连接性 2020-04-17 16:32:38 +08:00
BaiJiangJie 0d3fab216b
Merge pull request #3910 from jumpserver/dev_user 
[Update] 修改用户密码重置页面错误信息提示
 2020-04-17 11:27:26 +08:00
Bai 081f4b1c0a [Update] 修改用户密码重置页面错误信息提示 2020-04-17 11:26:29 +08:00
BaiJiangJie e9fe5b3004
Merge pull request #3908 from jumpserver/dev 
Dev
 2020-04-16 18:30:54 +08:00
BaiJiangJie 1de2923dd3
Merge pull request #3907 from jumpserver/dev_user 
[Update] 修改忘记密码页面的错误信息提示
 2020-04-16 18:30:07 +08:00
Bai 6890d549ed [Update] 修改忘记密码页面的错误信息提示 2020-04-16 18:29:02 +08:00
ibuler 6a2a0013a8 [Update] 去掉debug 2020-04-16 12:12:24 +08:00
ibuler 864a4c0485 [Bugfix] 修复显示未授权资产的bug 2020-04-16 12:08:52 +08:00
ibuler 3648a1458b [Update] 修改command options get view filter 2020-04-16 11:27:46 +08:00