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 |
老广
|
8c4e9720d3
|
Merge pull request #4183 from jumpserver/fix_template
docs(github): 修改 github issue 模板
|
2020-06-28 15:22:41 +08:00 |
ibuler
|
d43709f584
|
docs(github): 修改 github issue 模板
更改版本号说明,1.4及之前不再提供支持
|
2020-06-28 15:17:15 +08:00 |
BaiJiangJie
|
89496baae5
|
Merge pull request #4148 from jumpserver/v2.0
V2.0
|
2020-06-28 10:47:56 +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 |
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 |
老广
|
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 |
老广
|
e04e31eb30
|
Merge pull request #4129 from jumpserver/readme
feat: readme 添加docker pull
|
2020-06-22 12:08:28 +08:00 |
ibuler
|
ff747f9e42
|
feat: readme 添加docker pull
|
2020-06-22 12:06:42 +08:00 |
BaiJiangJie
|
c4bd093fd7
|
Merge pull request #4126 from jumpserver/v2.0
V2.0
|
2020-06-20 19:26:12 +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 |
xinwen
|
1d640eccf6
|
[Fix] `/opt/jumpserver/apps/jumpserver/views/index.py redirect(assets:user-asset-list)` (#4121)
|
2020-06-19 18:28:43 +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 |
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 |