github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
5,250 Commits
72 Branches
250 Tags
115 MiB
Commit Graph

5250 Commits (0dd4c8adc2fb78c972ddf3e2a3be08da42de58c7)

Author SHA1 Message Date
ibuler 0dd4c8adc2 Merge branch 'v2.0' of github.com:jumpserver/jumpserver into v2.0 2020-07-08 15:48:05 +08:00
xinwen a9626c2b39
Merge pull request #4223 from jumpserver/update-add-filter 
[Update] assets/gathered_user 添加过滤字段
 2020-07-01 17:32:58 +08:00
xinwen b265fad50f [Update] assets/gathered_user 添加过滤字段 2020-07-01 17:21:00 +08:00
BaiJiangJie f40b50dddd
Merge pull request #4209 from jumpserver/ftp_log_order 
fix:修改 ftp 日志按开始日期排序
 2020-07-01 15:02:44 +08:00
xinwen 0d6255b07f
Merge pull request #4218 from jumpserver/system-user-add-filter 
System user add filter
 2020-07-01 15:01:07 +08:00
xinwen 06b02cfcfd [Update] 系统用户添加过滤字段 2020-07-01 14:57:52 +08:00
jym503558564 a7e1ed6f03 fix:修改 ftp 日志按开始日期排序 2020-07-01 11:04:42 +08:00
xinwen 1c6f89519a
Merge pull request #4201 from jumpserver/fix-i18n 
Fix i18n
 2020-06-30 14:21:44 +08:00
xinwen 24d093747f [Fix] X-Pack/云管中心 i18n 2020-06-30 14:18:21 +08:00
BaiJiangJie ea6d995f55
Merge pull request #4147 from jumpserver/v2.0_bugfix_csv 
[Update] 修改csv导出，最大限制条目数从100->10000条
 2020-06-28 10:46:31 +08:00
Bai cf6aba1f38 [Update] 修改csv导出，最大限制条目数从100->10000条 2020-06-28 10:43:47 +08:00
老广 2acc1dc875
Merge pull request #4134 from jumpserver/fix-mfa-1.5 
Fix mfa 1.5
 2020-06-22 19:05:15 +08:00
xinwen 32ed43ba7b
Merge branch 'v2.0' into fix-mfa-1.5 2020-06-22 19:04:42 +08:00
xinwen 3e993fd044 [Update] 调整`MFA`绑定策略 V2 2020-06-22 19:02:14 +08:00
xinwen 005573b53b [Fix] 重新绑定 MFA 的漏洞 2020-06-22 18:03:45 +08:00
BaiJiangJie 408b2d6dbd
Merge pull request #4125 from jumpserver/v2.0_bugfix 
v2.0 添加改密计划安全模式配置项
 2020-06-20 19:24:17 +08:00
BaiJiangJie ebc63b9410
Merge pull request #4123 from jumpserver/v1.5_bugfix 
[Update] 添加改密计划安全模式配置项
 2020-06-20 16:20:53 +08:00
Michael Bai f1e5c7c2bb 添加改密计划安全模式配置项 2020-06-20 16:18:58 +08:00
Michael Bai fcb0aefe3c 更改改密计划安全模式配置项名 2020-06-20 15:47:39 +08:00
Bai 29666cc8d3 [Update] 添加改密计划安全模式配置项 2020-06-19 20:41:51 +08:00
BaiJiangJie 92fc0ceb16
Merge pull request #4118 from jumpserver/master 
Update readme
 2020-06-18 15:03:32 +08:00
BaiJiangJie 217ea03c18
Merge pull request #4117 from jumpserver/dev 
Dev
 2020-06-18 15:02:40 +08:00
BaiJiangJie 923f0ed477
Update README.md 2020-06-18 15:01:08 +08:00
BaiJiangJie 3c6cfaa6cf
Update README.md 2020-06-18 14:59:13 +08:00
BaiJiangJie 0bfe255966
Update README.md 2020-06-18 14:58:00 +08:00
BaiJiangJie af5d531131
Merge pull request #4116 from jumpserver/dev 
Dev
 2020-06-18 10:56:36 +08:00
Bai 10d58ef424 [Update] Merge from master to dev 2020-06-17 19:30:37 +08:00
Bai 64064cb526 [Update] 注释节点树print 2020-06-17 17:47:45 +08:00
Eric_Lee 46941037dd
add SECURITY_COMMAND_EXECUTION (#4114) 2020-06-17 15:03:41 +08:00
ibuler 7548bb8976 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2020-06-17 11:33:57 +08:00
ibuler 8ffa5e0aec 添加example api 2020-06-16 20:11:50 +08:00
xinwen 8ad71b6dd9
[Update] Move LOCAL_DYNAMIC_SETTINGS (#4113) 2020-06-16 18:11:23 +08:00
ibuler 220ccda04d fix: 修改domain创建的assets不是必填的 2020-06-16 17:55:18 +08:00
Eric_Lee 6d30fe797c
fix ldap test bug (#4110) 2020-06-16 17:25:57 +08:00
xinwen 3318df1771
[Fix] 日志审计/FTP日志 (#4109) 2020-06-16 16:33:53 +08:00
Eric_Lee 0ccd806eca
add system user perm api (#4108) 2020-06-16 16:12:59 +08:00
xinwen 7ebe1c2916
[Update] 优化 dynamic settings (#4107) 2020-06-16 15:54:19 +08:00
ibuler 08904c2a9f Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2020-06-16 15:30:39 +08:00
ibuler 19e34270d1 feat: gather user添加搜索字段 2020-06-16 15:30:25 +08:00
Bai afa515d570 Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev 2020-06-16 15:04:38 +08:00
Bai bcba408517 [Update] 修改用户source默认local 2020-06-16 15:04:01 +08:00
ibuler 80d94074e7 feat: 修改资产的标签搜索 2020-06-16 14:56:19 +08:00
ibuler 9347405f08 feat: terminal增加搜索 2020-06-16 13:50:21 +08:00
ibuler da4ad11a69 fix: 修改session command 翻译 2020-06-16 13:39:49 +08:00
ibuler b81e424e80 fix: 修改翻译 2020-06-16 12:20:16 +08:00
ibuler 1f15937139 feat: 修改翻译，添加settings 2020-06-16 11:04:59 +08:00
Bai f4fa011714 [Update] 修改mfa校验code无效翻译 2020-06-15 20:31:50 +08:00
xinwen c5a9a85818
[Update] 完善 作业中心/任务列表 (#4105) 2020-06-15 19:42:36 +08:00
ibuler e23bfa0f69 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2020-06-15 17:55:13 +08:00
ibuler 451690fe8b fix: 修改重定向 2020-06-15 17:44:40 +08:00