Commit Graph

6986 Commits

Author SHA1 Message Date
八千流
e061d9eb75
Merge pull request #277 from jumpserver/pr@dev@hotfix_build_error
fix(ticket): 修复Merge冲突造成的编译问题
2020-07-31 11:15:48 +08:00
OrangeM21
00cd04e103 fix(ticket): 修复Merge冲突造成的编译问题 2020-07-31 11:12:31 +08:00
Orange
4b3b1a723f
feat: 添加申请资源工单功能 (#185)
* [Feature] 添加申请资产工单

* feat: 添加资产申请工单功能

* update

* feat: 添加申请资源工单功能

* feat: 添加申请资源工单功能

* feat: 添加申请资源工单功能

* feat: 添加申请资源工单功能

* fix(终端列表): 还原终端列表的代码

* fix: 修改申请资源工单功能

* fix: 修改申请资源工单功能

* fix: 修改申请资源工单功能

* feat: 添加请求资产权限工单

* Update cn.json

* Update en.json

Co-authored-by: xinwen <coderWen@126.com>
2020-07-31 10:51:17 +08:00
OrangeM21
2d3a43c202 fix(dialog): 修复当有搜索条件时禁用导出所有选项
Closes https://github.com/jumpserver/trello/issues/74
2020-07-31 10:49:22 +08:00
fit2bot
e8e751668d
feat(terminalStorage): 添加批量更新终端存储功能 (#247)
* feat(terminalStorage): 添加批量更新终端存储功能

Closes https://github.com/jumpserver/jumpserver/issues/4392
Closes https://github.com/jumpserver/jumpserver/issues/4172

* update

* update

Co-authored-by: OrangeM21 <orangemtony@gmail.com>
2020-07-31 10:46:57 +08:00
OrangeM21
c6e0a17aaa fix: 修复创建远程应用密码框显示明文的问题
Closes https://github.com/jumpserver/trello/issues/133
2020-07-31 10:44:30 +08:00
OrangeM21
066d81446c fix(preload): 开启Preload
开启preload,提高首屏加载速度
2020-07-31 10:37:13 +08:00
fit2bot
a63b07cf2e
feat: 个人界面添加更新公钥快捷按钮 (#271)
* feat: 个人界面添加更新公钥快捷按钮

Closes https://github.com/jumpserver/jumpserver/issues/4361

* feat: feat: 个人界面添加更新公钥快捷按钮

Co-authored-by: OrangeM21 <orangemtony@gmail.com>
2020-07-31 10:32:26 +08:00
jym503558564
0ab96fa413 fix(detailCard): 修复详情页数据如果没有ID字段,则不显示ID 2020-07-31 10:30:27 +08:00
ibuler
e064c1cfc4 ci(docker): 使用docker缓存,使用npm mirror 2020-07-29 16:07:15 +08:00
jym503558564
2913699597 fix(tableList): 优化列表组件一些字段的宽度 2020-07-28 16:04:33 +08:00
jym503558564
c413623a22 fix(sessions_cmd_storage): 优化创建命令存储的提示文案 2020-07-28 16:03:15 +08:00
jym503558564
92f08605df fix(sessions_cmd_storage): 优化创建命令存储的提示文案 2020-07-28 16:03:15 +08:00
jym503558564
3fb32ad81c fix(sessions_cmd_storage): 优化创建命令存储的提示文案 2020-07-28 16:03:15 +08:00
jym503558564
760dbad5ac fix(ticket): 优化工单详情 2020-07-28 16:00:58 +08:00
jym503558564
878933bc07 fix(ticket): 优化工单详情 2020-07-28 16:00:58 +08:00
Orange
603ebff771
Merge pull request #217 from jumpserver/pr_dev_i18n_xpack_cloud
feat(AddTranslate): 添加云管账户详情翻译
2020-07-28 15:57:28 +08:00
jym503558564
c23ed70df4 fix(xpack):修改xpack指向 2020-07-28 15:56:18 +08:00
jym503558564
d21598cf1c fix(xpack): 更新xpack指向 2020-07-27 17:41:14 +08:00
OrangeM21
34f1b5d662 fix(CommandExecution): 修复命令过滤执行的系统用户选择 2020-07-24 11:32:37 +08:00
jym503558564
c493aca11b fix(assets): 优化资产详情中网域字段名的显示 2020-07-24 11:01:55 +08:00
jym503558564
cc937d600b fix(permissions): 优化授权列表各列宽度 2020-07-24 10:58:48 +08:00
OrangeM21
fcbe61cb92 fix(el-data-table): 修复翻页搜索结果不正确的问题
Closes https://github.com/jumpserver/trello/issues/69
Closes https://github.com/jumpserver/trello/issues/68
2020-07-24 10:53:26 +08:00
jym503558564
b39f01a023 fix(detailCard): detailCard 增加ID字段 2020-07-24 10:48:43 +08:00
jym503558564
794ad35f84 fix(sessionDetailTimeFormat): 优化会话详情中时间字段的显示格式 2020-07-24 10:46:32 +08:00
fit2bot
729b07798e
feat(Clipboard): 添加剪切板权限控制 (#238)
Co-authored-by: OrangeM21 <orangemtony@gmail.com>
2020-07-24 10:44:47 +08:00
fit2bot
f2514f68b8
fix(select2): 默认添加clearable属性 (#240)
* fix(select2): 默认添加clearable属性


Co-authored-by: OrangeM21 <orangemtony@gmail.com>
2020-07-24 10:35:41 +08:00
fit2bot
30d4044d20
fix(perms): 优化授权列表添加刷新按钮 (#245)
* fix(perms): 优化授权列表添加刷新按钮

* fix(perms): 优化授权列表添加导入导出按钮

Co-authored-by: jym503558564 <503558564@qq.com>
2020-07-24 10:20:37 +08:00
jym503558564
e7cd6e49e8 fix(Xpack): 更新xpack指向 2020-07-21 15:45:03 +08:00
OrangeM21
75276d37e4 fix: 添加form组件的refs 2020-07-21 15:04:24 +08:00
Orange
5a92c4f3ee
Merge pull request #228 from jumpserver/pr@dev@ci_add_generic_handler
ci(github): 添加通用action
2020-07-21 13:08:36 +08:00
Orange
ae6fb22fae
Merge pull request #229 from jumpserver/pr@master@ci_add_generic_handler
ci(github): 添加通用action
2020-07-21 13:07:55 +08:00
github-actions
ccd98606a1 ci(github): 添加通用action 2020-07-21 05:06:02 +00:00
github-actions
7f2ed5d038 ci(github): 添加通用action 2020-07-21 05:05:59 +00:00
jym503558564
d24741ab4b feat(AddTranslate): 添加云管账户详情翻译 2020-07-20 11:38:19 +08:00
Orange
9ac5eabff2
Merge pull request #212 from jumpserver/pr_dev_ci-change
ci(pull-request): 添加自动pr打标签功能
2020-07-17 16:14:52 +08:00
ibuler
18b5fafa41 ci(pull-request): 添加自动pr打标签功能 2020-07-17 16:10:02 +08:00
Orange
8a76bb05ac
Merge pull request #208 from jumpserver/jym_bug_fix
fix(settings): 修复安全设置页面更新不了的问题
2020-07-16 15:49:18 +08:00
Orange
ad5b5c7c20
Merge pull request #207 from jumpserver/jym_bug_fix
fix(settings): 修复安全设置页面更新不了的问题
2020-07-16 15:48:40 +08:00
jym503558564
fe7d43f669 fix(settings): 修复安全设置页面更新不了的问题 2020-07-16 15:35:42 +08:00
八千流
aad23f3de5
Merge pull request #202 from jumpserver/dev
merge(master): Merge from dev to master
2020-07-16 11:12:33 +08:00
八千流
9c33093b01
Merge pull request #205 from jumpserver/update_xpack
update:Xpack
2020-07-16 11:11:00 +08:00
OrangeM21
c94a5dfa1f update:Xpack 2020-07-16 11:08:24 +08:00
八千流
143973531c
Merge pull request #204 from jumpserver/update_xpack_master
fix: 更新Master Xpack代码
2020-07-16 11:05:29 +08:00
OrangeM21
7db590950c fix: 更新Master Xpack代码 2020-07-16 11:04:13 +08:00
八千流
7e65a52062
Merge pull request #203 from jumpserver/update_xpack
fix: 更新Xpack代码
2020-07-16 11:01:05 +08:00
OrangeM21
226d118d28 fix: 更新Xpack代码 2020-07-16 10:58:49 +08:00
老广
0e3bd186fe
Merge pull request #201 from jumpserver/v2.0
Merge v2.0
2020-07-16 10:44:27 +08:00
八千流
50e8dfc86d
fix(timeFormat): 统一时间格式 (#197)
* fix(timeFormat): 统一时间格式

* fix: 更新Xpack代码

Co-authored-by: OrangeM21 <orangemtony@gmail.com>
2020-07-15 20:46:01 +08:00
OrangeM21
a023e03074 fix: 更新Xpack代码&&用户界面资产添加备注选项
Closes https://github.com/jumpserver/trello/issues/75
2020-07-15 20:43:39 +08:00