Bai
|
7c12f8f462
|
merge: Merge to dev from branch master
|
4 years ago |
xinwen
|
6f5a92c21f
|
[Update] assets/gathered_user 添加过滤字段
|
4 years ago |
xinwen
|
17a76994dc
|
[Update] 系统用户添加过滤字段
|
4 years ago |
jym503558564
|
39d793bc47
|
fix:修改 ftp 日志按开始日期排序
|
4 years ago |
xinwen
|
c3eafbee8c
|
[Fix] X-Pack/云管中心 i18n
|
4 years ago |
ibuler
|
10f99be100
|
添加example api
|
4 years ago |
xinwen
|
8eb6cfa9c9
|
fix(ticket): 修改工单获取系统用户的字段 (#4274)
fix(ticket): 申请资产工单修改bug
|
4 years ago |
xinwen
|
f430c9e435
|
Merge pull request #4270 from jumpserver/request-asset-ticket-dev
feat(ticket): 添加申请资产工单
|
4 years ago |
BaiJiangJie
|
10c428a432
|
Merge pull request #4269 from jumpserver/dev_user_group
fix(user_group): 用户组中添加用户,取消审计员的限制
|
4 years ago |
Bai
|
a30c603bdc
|
fix(user_group): 用户组中添加用户,取消审计员的限制
|
4 years ago |
xinwen
|
39a75074af
|
[Feature] 添加申请资产工单
|
4 years ago |
BaiJiangJie
|
452ed2baf1
|
Merge pull request #4268 from jumpserver/dev_adminuser
fix(assets): 修复测试管理用户/系统用户资产可连接性问题
|
4 years ago |
Bai
|
8c7240193a
|
fix(system_user): 修复系统用户测试可连接性失败问题(所有资产)(不应该执行校验系统用户是否可以推送的逻辑)
|
4 years ago |
Bai
|
b622aca9af
|
fix(admin_user): 修复管理用户单独测试某台资产可连接性失败的情况(private_key_file)
|
4 years ago |
ibuler
|
ce7edc1612
|
ci(release): 修改 release 使用的tag,而不是自动生成的
|
4 years ago |
BaiJiangJie
|
ebf1a9d5e2
|
Merge pull request #4255 from jumpserver/dev_asset
feat(assets): 资产序列类修改字段名 _name 为 _display
|
4 years ago |
ibuler
|
23ef185b7e
|
fix(build): 修改调用action jumpserver/action-build-upload-asset的参数
|
4 years ago |
Bai
|
69f49f7776
|
feat(i18n): 修改翻译
|
4 years ago |
ibuler
|
6b16aa6bc0
|
ci(build): 修改 构建脚本
- sed 在不同系统下表现不同
|
4 years ago |
ibuler
|
43741dc9b2
|
ci(build): 修改 workflow
- 修改使用action jumpserver/action-build-upload-assets
|
4 years ago |
ibuler
|
18174e2867
|
fix(build): 修稿构建
|
4 years ago |
ibuler
|
3077d11483
|
ci(release&build): 添加 github workflows, 自动构建 release
- 添加 utils/build.sh 脚本,构建后放到 release 目录中
- 当 push tags时,自动创建 Release Draft
- 自动生成 Release Change Log
- 自动构建包,上传到 Release Assets
|
4 years ago |
Bai
|
fcd684e2db
|
feat(assets): 资产序列类修改字段名 _name 为 _display
|
4 years ago |
BaiJiangJie
|
afcb6bd77c
|
Merge pull request #4242 from jumpserver/dev_cloud
feat(node + domain + domain_migrate): NodeModel添加get_or_create_child()方法,修改网域唯一字段 org_id+name
|
4 years ago |
Bai
|
1c264399bb
|
feat(domain + migrate): 修改网域唯一字段为:org_id + name
|
4 years ago |
Bai
|
872e2546e9
|
feat(node): NodeModel添加方法get_or_create_child()
|
4 years ago |
BaiJiangJie
|
8f347eee4d
|
Merge pull request #4216 from jumpserver/dev_org
feat(Cloud): 组织管理ViewSet添加搜索字段
|
4 years ago |
BaiJiangJie
|
fa886b90c2
|
Merge pull request #4211 from jumpserver/dev_command_execute
feat(Command execute): 批量命令执行配置添加默认值True
|
4 years ago |
Bai
|
caf312c5be
|
feat(Cloud): 组织管理ViewSet添加搜索字段
|
4 years ago |
Bai
|
ac6168a06c
|
feat(Command execute): 批量命令执行配置添加默认值True
|
4 years ago |
BaiJiangJie
|
eba9f2325a
|
Merge pull request #4204 from jumpserver/dev_login_password_encrypt
feat(Login password ecrypt): 登录密码加密传输
|
4 years ago |
Bai
|
b46e772d09
|
feat(login password ecrypt): 登录密码加密传输 4
|
4 years ago |
Bai
|
183df82a75
|
feat(login password ecrypt): 登录密码加密传输 3
|
4 years ago |
Bai
|
98c91d0f18
|
feat(login password ecrypt): 登录密码加密传输(添加翻译)
|
4 years ago |
Bai
|
e17d875206
|
feat(login password ecrypt): 登录密码加密传输2
|
4 years ago |
Bai
|
4b1e84ed8a
|
Merge branch 'dev' into dev_login_password_encrypt
|
4 years ago |
Bai
|
71ee33e3be
|
feat(login password ecrypt): 登录密码加密传输
|
4 years ago |
xinwen
|
5dd24f5cf9
|
Merge pull request #4188 from jumpserver/limit-upload-csv
[Update] 限制上传CSV文件的大小
|
4 years ago |
xinwen
|
2b6e818943
|
[Update] 限制上传CSV文件的大小
|
4 years ago |
老广
|
8c4e9720d3
|
Merge pull request #4183 from jumpserver/fix_template
docs(github): 修改 github issue 模板
|
4 years ago |
ibuler
|
d43709f584
|
docs(github): 修改 github issue 模板
更改版本号说明,1.4及之前不再提供支持
|
4 years ago |
BaiJiangJie
|
89496baae5
|
Merge pull request #4148 from jumpserver/v2.0
V2.0
|
4 years ago |
BaiJiangJie
|
ea6d995f55
|
Merge pull request #4147 from jumpserver/v2.0_bugfix_csv
[Update] 修改csv导出,最大限制条目数从100->10000条
|
4 years ago |
Bai
|
cf6aba1f38
|
[Update] 修改csv导出,最大限制条目数从100->10000条
|
4 years ago |
BaiJiangJie
|
fdcda83c93
|
Merge pull request #4142 from jumpserver/sftp-log-i18n
Sftp log i18n
|
4 years ago |
xinwen
|
6e3369c944
|
[Update] sftp log页面操作翻译
|
4 years ago |
BaiJiangJie
|
d7e432a851
|
Merge pull request #4139 from jumpserver/dev_session
[Update] UserProfileAPI 判断是否设置session过期时间,解决前端关闭浏览器session未失效的问题
|
4 years ago |
Bai
|
c0a153d13a
|
[Update] UserProfileAPI 判断是否设置session过期时间,解决前端关闭浏览器session未失效的问题
|
4 years ago |
老广
|
2acc1dc875
|
Merge pull request #4134 from jumpserver/fix-mfa-1.5
Fix mfa 1.5
|
4 years ago |
xinwen
|
32ed43ba7b
|
Merge branch 'v2.0' into fix-mfa-1.5
|
4 years ago |