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

5290 Commits (f588093cd3a4a544239ce38b73ac46393fbbfd62)

Author SHA1 Message Date
BaiJiangJie f588093cd3
Merge pull request #4282 from jumpserver/dev_master 
merge: Merge to master from branch dev
 2020-07-09 14:51:03 +08:00
Bai 7c12f8f462 merge: Merge to dev from branch master 2020-07-09 14:27:08 +08:00
xinwen 6f5a92c21f [Update] assets/gathered_user 添加过滤字段 2020-07-09 14:08:46 +08:00
xinwen 17a76994dc [Update] 系统用户添加过滤字段 2020-07-09 14:08:46 +08:00
jym503558564 39d793bc47 fix:修改 ftp 日志按开始日期排序 2020-07-09 14:08:46 +08:00
xinwen c3eafbee8c [Fix] X-Pack/云管中心 i18n 2020-07-09 14:08:46 +08:00
ibuler 10f99be100 添加example api 2020-07-09 14:08:46 +08:00
xinwen 8eb6cfa9c9
fix(ticket): 修改工单获取系统用户的字段 (#4274) 
fix(ticket): 申请资产工单修改bug
 2020-07-09 14:06:06 +08:00
xinwen f430c9e435
Merge pull request #4270 from jumpserver/request-asset-ticket-dev 
feat(ticket): 添加申请资产工单
 2020-07-08 15:42:04 +08:00
BaiJiangJie 10c428a432
Merge pull request #4269 from jumpserver/dev_user_group 
fix(user_group): 用户组中添加用户，取消审计员的限制
 2020-07-08 15:23:45 +08:00
Bai a30c603bdc fix(user_group): 用户组中添加用户，取消审计员的限制 2020-07-08 15:17:07 +08:00
xinwen 39a75074af [Feature] 添加申请资产工单 2020-07-08 15:09:44 +08:00
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
ibuler ce7edc1612 ci(release): 修改 release 使用的tag，而不是自动生成的 2020-07-08 10:36:43 +08:00
BaiJiangJie ebf1a9d5e2
Merge pull request #4255 from jumpserver/dev_asset 
feat(assets): 资产序列类修改字段名 _name 为 _display
 2020-07-07 14:36:27 +08:00
ibuler 23ef185b7e fix(build): 修改调用action jumpserver/action-build-upload-asset的参数 2020-07-07 14:30:34 +08:00
Bai 69f49f7776 feat(i18n): 修改翻译 2020-07-07 14:13:20 +08:00
ibuler 6b16aa6bc0 ci(build): 修改 构建脚本 
- sed 在不同系统下表现不同
 2020-07-07 13:52:50 +08:00
ibuler 43741dc9b2 ci(build): 修改 workflow 
- 修改使用action jumpserver/action-build-upload-assets
 2020-07-07 13:38:26 +08:00
ibuler 18174e2867 fix(build): 修稿构建 2020-07-07 13:28:59 +08:00
ibuler 3077d11483 ci(release&build): 添加 github workflows, 自动构建 release 
- 添加 utils/build.sh 脚本，构建后放到 release 目录中
- 当 push tags时，自动创建 Release Draft
- 自动生成 Release Change Log
- 自动构建包，上传到 Release Assets
 2020-07-07 13:03:48 +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
老广 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