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

5251 Commits (452ed2baf1dc39a840c36e7df58c182368a83d64)

Author SHA1 Message Date
BaiJiangJie 452ed2baf1
Merge pull request #4268 from jumpserver/dev_adminuser 
fix(assets): 修复测试管理用户/系统用户资产可连接性问题
 2020-07-08 14:47:09 +08:00
Bai 8c7240193a fix(system_user): 修复系统用户测试可连接性失败问题（所有资产）（不应该执行校验系统用户是否可以推送的逻辑） 2020-07-08 11:30:37 +08:00
Bai b622aca9af fix(admin_user): 修复管理用户单独测试某台资产可连接性失败的情况（private_key_file) 2020-07-08 10:48:25 +08:00
BaiJiangJie ebf1a9d5e2
Merge pull request #4255 from jumpserver/dev_asset 
feat(assets): 资产序列类修改字段名 _name 为 _display
 2020-07-07 14:36:27 +08:00
Bai 69f49f7776 feat(i18n): 修改翻译 2020-07-07 14:13:20 +08:00
Bai fcd684e2db feat(assets): 资产序列类修改字段名 _name 为 _display 2020-07-07 11:09:43 +08:00
BaiJiangJie afcb6bd77c
Merge pull request #4242 from jumpserver/dev_cloud 
feat(node + domain + domain_migrate): NodeModel添加get_or_create_child()方法，修改网域唯一字段 org_id+name
 2020-07-06 15:18:13 +08:00
Bai 1c264399bb feat(domain + migrate): 修改网域唯一字段为：org_id + name 2020-07-02 18:51:16 +08:00
Bai 872e2546e9 feat(node): NodeModel添加方法get_or_create_child() 2020-07-02 18:49:17 +08:00
BaiJiangJie 8f347eee4d
Merge pull request #4216 from jumpserver/dev_org 
feat(Cloud): 组织管理ViewSet添加搜索字段
 2020-07-01 14:57:50 +08:00
BaiJiangJie fa886b90c2
Merge pull request #4211 from jumpserver/dev_command_execute 
feat(Command execute): 批量命令执行配置添加默认值True
 2020-07-01 14:57:37 +08:00
Bai caf312c5be feat(Cloud): 组织管理ViewSet添加搜索字段 2020-07-01 14:38:03 +08:00
Bai ac6168a06c feat(Command execute): 批量命令执行配置添加默认值True 2020-07-01 11:19:57 +08:00
BaiJiangJie eba9f2325a
Merge pull request #4204 from jumpserver/dev_login_password_encrypt 
feat(Login password ecrypt): 登录密码加密传输
 2020-06-30 18:57:51 +08:00
Bai b46e772d09 feat(login password ecrypt): 登录密码加密传输 4 2020-06-30 18:35:01 +08:00
Bai 183df82a75 feat(login password ecrypt): 登录密码加密传输 3 2020-06-30 18:14:53 +08:00
Bai 98c91d0f18 feat(login password ecrypt): 登录密码加密传输（添加翻译） 2020-06-30 17:37:16 +08:00
Bai e17d875206 feat(login password ecrypt): 登录密码加密传输2 2020-06-30 17:23:56 +08:00
Bai 4b1e84ed8a Merge branch 'dev' into dev_login_password_encrypt 2020-06-30 17:13:08 +08:00
Bai 71ee33e3be feat(login password ecrypt): 登录密码加密传输 2020-06-30 17:12:38 +08:00
xinwen 5dd24f5cf9
Merge pull request #4188 from jumpserver/limit-upload-csv 
[Update] 限制上传CSV文件的大小
 2020-06-28 19:13:53 +08:00
xinwen 2b6e818943 [Update] 限制上传CSV文件的大小 2020-06-28 19:02:20 +08:00
BaiJiangJie fdcda83c93
Merge pull request #4142 from jumpserver/sftp-log-i18n 
Sftp log i18n
 2020-06-24 17:30:57 +08:00
xinwen 6e3369c944 [Update] sftp log页面操作翻译 2020-06-24 17:22:53 +08:00
BaiJiangJie d7e432a851
Merge pull request #4139 from jumpserver/dev_session 
[Update] UserProfileAPI 判断是否设置session过期时间，解决前端关闭浏览器session未失效的问题
 2020-06-24 16:14:36 +08:00
Bai c0a153d13a [Update] UserProfileAPI 判断是否设置session过期时间，解决前端关闭浏览器session未失效的问题 2020-06-24 10:52:05 +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
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
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