github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-08-25 09:58:53 +00:00
Code Issues Projects Releases Wiki Activity
7,276 Commits 106 Branches 219 Tags 39 MiB
pr@dev@feat_ad_domain
Commit Graph

7276 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Orange
1519ccb8e2 fix: 修改添加用户API 2020-10-12 05:40:14 -05:00
fit2bot
47e88e7bb4
perf(org): 添加组织成员合并成一个card (#422) 
* perf(org): 添加组织成员合并成一个card

* perf(org): 添加成员后，object需重新刷新才能重新获取新值

Co-authored-by: jym503558564 <503558564@qq.com>
 2020-10-12 10:55:56 +08:00
Orange
c86aef999c fix: 调整badge位置 2020-10-11 21:45:41 -05:00
jym503558564
2f9d7ab826 perf(protocol): 批量更新协议组给默认值 2020-10-11 21:41:42 -05:00
fit2bot
b4311b8a59
perf(permSelectAssetCard): 优化授权详情页中的添加资产，将已添加的资产disable掉 (#405) 
* perf(permSelectAssetCard): 优化授权详情页中的添加资产，将已添加的资产disable掉

* perf(permSelectAssetCard): 修改全选时，禁用也被选择的bug

* perf(assetSelect): 修改名称

Co-authored-by: jym503558564 <503558564@qq.com>
 2020-10-09 11:05:42 +08:00
Jiangjie.Bai
04a97a9923
Merge pull request #418 from jumpserver/dev 
Merge Dev
 2020-10-09 10:56:15 +08:00
jym503558564
c7624f9092 perf(relationCard): 优化relationCard以及添加组织成员翻译 2020-10-08 21:08:02 -05:00
fit2bot
fc29fc6c6d
feat: 工单入口移动至Header栏 (#417) 
* feat: 工单入口移动至Header栏

* feat: 工单入口移动至Header栏

Co-authored-by: Orange <orangemtony@gmail.com>
 2020-10-09 10:00:23 +08:00
ibuler
7afc501db5 perf: 修改长度 2020-09-30 03:45:31 -05:00
Orange
8ed5672e95 fix: 修复工单审批时系统用户多选参数配置问题 2020-09-29 19:02:13 +08:00
Orange
951c9f56c5 fix: 修复工单审批时系统用户多选参数配置问题 2020-09-29 19:02:13 +08:00
Orange
2c0e079aa2 fix: 修复工单审批时系统用户多选参数配置问题 2020-09-29 16:35:11 +08:00
jym503558564
a8e7ea9c80 perf(ticket): 优化授权工单，支持填写系统用户，审批时系统用户支持选多个 2020-09-29 15:13:10 +08:00
Orange
30143f833a
feat: 添加邀请用户进入组织功能 (#411) 
* feat: 添加邀请用户进入组织功能
 2020-09-29 15:10:48 +08:00
ibuler
ad88daef9a chore: merge xpack dev pr 2020-09-29 14:26:05 +08:00
ibuler
9eb80eb6ca chore: add package 2020-09-29 14:26:05 +08:00
Orange
112de6e81c feat: 添加403请求拦截器 
Closes https://github.com/jumpserver/trello/issues/238
 2020-09-28 16:51:57 +08:00
Orange
d01f903a9e fix: 临时禁用树节点移动 
Closes https://github.com/jumpserver/lina/issues/383
 2020-09-28 16:50:39 +08:00
Orange
af6d0aff7c fix: 使用http-equiv功能禁止index.html缓存 2020-09-28 16:49:02 +08:00
Orange
edf8621e8f fix: 修复版本更新Index.html不刷新的问题 2020-09-28 16:49:02 +08:00
Orange
eeb15c624a fix: 修复组织名称更新列表未刷新的问题 2020-09-28 16:48:15 +08:00
Orange
79e2d49a3d fix: 修复页面title设置不生效问题 
Closes https://github.com/jumpserver/trello/issues/302
 2020-09-28 16:47:22 +08:00
Orange
628395e447 fix: 修复命令存储更新问题 2020-09-24 15:54:23 +08:00
八千流
6cb6e6444b
Merge pull request #394 from jumpserver/pr@dev@fix_command_filter 
feat: 修复命令过滤详情添加系统用户的问题
 2020-09-22 15:09:19 +08:00
八千流
1b9aa23761
Merge pull request #397 from jumpserver/pe@dev@fix_change_orgs_url 
fix: 修复更改组织时路径跳转的问题
 2020-09-22 15:08:56 +08:00
jym503558564
537c385ecf perf(licenseExpired): 优化license过期提醒 2020-09-22 15:06:39 +08:00
jym503558564
c0f7d6e7ff perf(translate): 修改界面设置的一些字段翻译 2020-09-22 15:05:41 +08:00
jym503558564
78df96f888 feat(batchUpdateProtocols): 新增批量更新协议组 2020-09-22 15:05:08 +08:00
jym503558564
829957090d fix(gateway): 修复测试网关端口数据类型：String改为Int类型 2020-09-22 15:04:42 +08:00
jym503558564
026c8f37ea perf(navHeader): 在页面右上角添加web终端 2020-09-22 15:04:02 +08:00
Orange
97340c6aac feat: 修复更改组织时路径跳转的问题 2020-09-18 15:18:55 +08:00
Orange
bbe54eae48 fix: 修复Build失败的问题 2020-09-18 11:43:19 +08:00
Orange
9137207055 feat: 修复命令过滤详情添加系统用户的问题 2020-09-17 15:10:30 +08:00
Jiangjie.Bai
0ef30ef651
Merge pull request #392 from jumpserver/dev 
Merge Dev
 2020-09-17 12:11:23 +08:00
Orange
5ae8a6c9e4 fix: 禁用命令记录列表导出选择项 2020-09-17 12:10:46 +08:00
Orange
ace1dcd0b8 fix: 修复切换组织时权限展示问题 
Closes https://github.com/jumpserver/trello/issues/332
 2020-09-17 11:06:40 +08:00
Jiangjie.Bai
5df487d6bd
Merge pull request #390 from jumpserver/dev 
chore: 去掉submodule
 2020-09-15 17:21:32 +08:00
ibuler
6e548749e1 Removed submodule 2020-09-15 16:26:11 +08:00
ibuler
99885d9f28 chore: 去掉submodule 2020-09-15 16:16:11 +08:00
Orange
83163e11e3
Merge pull request #387 from jumpserver/dev 
Merge dev
 2020-09-15 16:02:49 +08:00
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