github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-07-10 13:45:27 +00:00
Code Issues Projects Releases Wiki Activity
6,986 Commits 98 Branches 217 Tags 35 MiB
pr@dev@risk
Commit Graph

6986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Orange
8c191fee67
Merge pull request #386 from jumpserver/pr@dev@feat_hidden_tickets 
perf: 优化license的路由判断
 2020-09-15 15:17:32 +08:00
ibuler
ff9862fa06 perf: 优化license的路由判断 2020-09-15 15:14:07 +08:00
ibuler
db0cea7051 feat: 可以设置隐藏工单 2020-09-15 14:55:38 +08:00
Orange
305c713a57
Merge pull request #382 from jumpserver/dev 
chore: 更新Xpack版本
 2020-09-08 20:35:35 +08:00
Orange
8a5f93e268 chore: 更新Xpack版本 2020-09-08 20:34:19 +08:00
Jiangjie.Bai
c4d262150b
Merge pull request #374 from jumpserver/dev 
Merge dev to master
 2020-09-08 20:28:47 +08:00
Jiangjie.Bai
94f161f7e6
Merge pull request #380 from jumpserver/pr@dev@merge_Master 
修复Merge冲突
 2020-09-08 20:26:52 +08:00
Orange
2c5bfb3f4c 修复Merge冲突 2020-09-08 20:24:35 +08:00
Orange
8e12837a77 fix: 修复请求计时器时间问题 2020-09-08 20:22:29 +08:00
ibuler
4385d84f01 feat: 请求时刷新session age 2020-09-08 20:15:42 +08:00
Orange
214bb28c4c chore: 更新Submodule指向 2020-09-08 20:14:56 +08:00
Orange
14c2285ac8
Merge pull request #375 from jumpserver/pr@master@update_xpack_brench 
chore: 更新Submodule指向
 2020-09-08 20:11:41 +08:00
Orange
18cbe578f0 chore: 更新Submodule指向 2020-09-08 20:09:09 +08:00
fit2bot
e19ded8365
bug(userDetail): 修复用户详情删除其某条授权规则失败的问题 (#371) 
Co-authored-by: jym503558564 <503558564@qq.com>
 2020-09-08 19:20:24 +08:00
fit2bot
0150008075
fix: 修复备注过长的显示问题 (#373) 
Closes https://github.com/jumpserver/lina/issues/341

Co-authored-by: Orange <orangemtony@gmail.com>
 2020-09-08 19:19:20 +08:00
Orange
b0bca65cab fix: 修复工单列表提交的问题 
Closes https://github.com/jumpserver/trello/issues/312
 2020-09-08 12:17:49 +08:00
jym503558564
cb95b9ba4f perf(assetCreateUpdate): 优化资产创建或更新页面的ip字段翻译 2020-09-07 20:05:25 +08:00
jym503558564
4a840288c5 pref(assetSelect): 优化资产选择表单字段翻译 2020-09-07 20:05:25 +08:00
ibuler
11b1d6638d perf(xpack): 优化license导入 2020-09-07 20:04:07 +08:00
Bai
2225807a36 feat(tickets): 工单添加comment字段 2020-09-07 20:01:22 +08:00
Bai
a8baca81d5 feat(i18n): 添加云同步实例任务的hostname_strategy翻译 2020-09-07 17:52:05 +08:00
jym503558564
30161c7178 perf(pref_ticket_badge): 优化badge的背景色 2020-09-07 17:41:33 +08:00
jym503558564
e222d147f6 pref(tickerBadge): 在ticket页面添加badge 2020-09-07 17:41:33 +08:00
jym503558564
3ddc41707c pref(storage): 修改录像存储的配置 2020-09-03 12:51:47 +08:00
jym503558564
a245055150 pref(storageHelpText): 添加录像存储endpoint提示 2020-09-03 12:51:47 +08:00
Orange
ba5fdf2027 fix: 修复LDAP部分问题 2020-09-03 12:50:50 +08:00
jym503558564
e1999e5ce8 pref(textarea): 优化textarea的minRows为3 2020-09-02 14:23:22 +08:00
jym503558564
be4e0b5e35 pref(formRequired): 统一form required 2020-09-02 14:22:50 +08:00
八千流
82c381b80d
Merge pull request #359 from jumpserver/revert-356-pr@dev@pref_ticket_comment 
Revert "pref(ticket): 优化工单评论显示，我的回复显示在右边，其它回复均显示在左边"
 2020-09-02 10:16:53 +08:00
老广
7d71aa96b9 Revert "pref(ticket): 优化工单评论显示，我的回复显示在右边，其它回复均显示在左边 (#356)" 
This reverts commit cea03df4eb.
 2020-09-02 10:15:02 +08:00
Orange
93408e52c1 feat: 导入组件时按钮显示加载状态 
Closes https://github.com/jumpserver/trello/issues/87
 2020-09-01 11:45:59 +08:00
fit2bot
cea03df4eb
pref(ticket): 优化工单评论显示，我的回复显示在右边，其它回复均显示在左边 (#356) 
* pref(ticket): 优化工单评论显示，我的回复显示在右边，其它回复均显示在左边

* pref(ticket): 优化评论显示

* pref(ticket): 修改方法名

Co-authored-by: jym503558564 <503558564@qq.com>
 2020-09-01 11:34:43 +08:00
fit2bot
72ee5f60b9
pref(permission): 资产授权详情页添加动作字段 (#353) 
* pref(permission): 资产授权详情页添加动作字段

* pref(permission): 修改翻译

Co-authored-by: jym503558564 <503558564@qq.com>
 2020-09-01 11:14:58 +08:00
jym503558564
f6a8e5634b pref(userProfile): 优化ssh公钥textarea字段为自适应高度 2020-09-01 11:00:00 +08:00
Orange
868e77c983 feat: 添加测试网关弹窗 
Closes https://github.com/jumpserver/trello/issues/191
 2020-09-01 10:57:57 +08:00
jym503558564
2a3fd42ca1 pref(storage): 优化存储表单页面 2020-08-31 13:45:11 +08:00
jym503558564
596a26bfb6 pref(session): 优化会话列表字段翻译 2020-08-31 13:40:19 +08:00
Orange
2fc8cea9ef fix: 修复K8S系统用户更新时令牌是必填项的问题 
Closes https://github.com/jumpserver/trello/issues/276
 2020-08-28 18:03:20 +08:00
Orange
6f8a5c2bfc fix: 授权Actions组件默认折叠 
Closes https://github.com/jumpserver/trello/issues/287
 2020-08-28 18:00:46 +08:00
Orange
260901351f 修复Core设置SECURITY_VIEW_AUTH_NEED_MFA失效的问题 2020-08-28 17:59:45 +08:00
Orange
66845e58db 修复Core设置SECURITY_VIEW_AUTH_NEED_MFA失效的问题 2020-08-28 17:59:45 +08:00
OrangeM21
0e9e549bea fix: 修改样例中的端口号 2020-08-20 16:51:46 +08:00
OrangeM21
785611414e fix: 修改样例中的端口号 2020-08-20 16:50:38 +08:00
OrangeM21
19267ee001 fix: 更新Xpack代码 2020-08-20 01:42:47 -05:00
老广
65326916ca
chore: merge dev to master (#338) 
* fix(systemUser): 修复创建k8s系统用户的问题 (#315)

Co-authored-by: jym503558564 <503558564@qq.com>

* fix(csrfToken): 更新CsrfToken的获取方式,改为从Cookie中获取

* pref(i18n): 修改工单详情页的字段翻译

* fix(systemUserCreate): 优化系统用户创建页面

* fix: 通用导出组件提供默认选项

Closes https://github.com/jumpserver/trello/issues/253

* fix: 修复工单列表的状态展示

Closes https://github.com/jumpserver/trello/issues/198

* fix: 修复工单关闭请求问题

* update

* update

* update

* update

* pref(K8s): 统一Kubernetes翻译

* pref(settings): 优化系统设置提示英文的问题

* fix: 优化创建系统用户时表单联动

Closes https://github.com/jumpserver/trello/issues/180

* fix: 修改翻译

其他 => 其它

Closes https://github.com/jumpserver/trello/issues/181

* fix: 创建用户字段显示隐藏问题

* update

* update

* update

* fix: 修改添加组织表单

* fix: 更新密码后刷新表单

* fix: 修改Xpack指向最新代码

* fix: 修改工单备注提交结构

* fix: 调整工单翻译以及角色顺序

* fix: 更新翻译

* fix: 更新翻译

* fix: 修复Safari时间显示问题

Closes https://github.com/jumpserver/trello/issues/237

* Update common.js

Co-authored-by: fit2bot <68588906+fit2bot@users.noreply.github.com>
Co-authored-by: jym503558564 <503558564@qq.com>
Co-authored-by: OrangeM21 <orangemtony@gmail.com>
 2020-08-20 14:42:11 +08:00
fit2bot
0b925ccf33
pref(xpack): 修改lina master xpack 指向 (#339) 
Co-authored-by: jym503558564 <503558564@qq.com>
 2020-08-20 14:12:37 +08:00
Orange
58505d2b50 Update common.js 2020-08-19 23:42:17 -05:00
OrangeM21
ecae504a80 fix: 修复Safari时间显示问题 
Closes https://github.com/jumpserver/trello/issues/237
 2020-08-19 23:42:17 -05:00
OrangeM21
844bc5b44f fix: 更新翻译 2020-08-19 22:22:39 -05:00
OrangeM21
c1dcf82fbd fix: 更新翻译 2020-08-19 22:22:39 -05:00