github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-08-14 13:03:07 +00:00
Code Issues Projects Releases Wiki Activity
7,143 Commits 104 Branches 218 Tags 37 MiB
pr@dev@fix_accout_push
Commit Graph

581 Commits

Author SHA1 Message Date
fit2bot
32fa4f0b11
feat: 资产允许编辑更多信息 (#530) 
* feat: 资产允许编辑更多信息

* feat: 资产允许编辑更多资产信息

* feat: 资产允许编辑更多资产信息

* fix: 修改组件名称

Co-authored-by: Orange <orangemtony@gmail.com>
 2020-12-08 20:25:54 +08:00
Orange
e6aaa52506 perf: 恢复Web终端入口 2020-11-26 12:38:28 +08:00
fit2bot
c0d3fbb47a
fix: 修复权限认证问题 (#482) 
* fix: 修复权限认证问题

* fix: 修复权限认证问题

Co-authored-by: Orange <orangemtony@gmail.com>
 2020-11-05 18:59:08 +08:00
Orange
66b1d17dd2 fix: 用户界面隐藏左侧侧边栏web终端入口 2020-11-05 09:52:32 +08:00
fit2bot
6c1f8ec8f7
feat: 整理重构应用模块及应用授权模块 (#465) 
* feat: 整理重构应用模块及应用授权模块

Co-authored-by: Orange <orangemtony@gmail.com>
 2020-11-03 14:28:36 +08:00
fit2bot
697b5a3d13
perf(permTranslate): 修改翻译 (#462) 
* perf(permTranslate): 修改授权一些翻译

* perf(permTranslate): 修改翻译

Co-authored-by: jym503558564 <503558564@qq.com>
 2020-10-29 10:49:29 +08:00
Orange
747477b27c perf: 隐藏左侧边栏Web终端入口 2020-10-28 21:47:00 -05:00
Orange
23740cdce0 fix: 隐藏用户界面工单 2020-10-14 17:57:59 +08: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
ff9862fa06 perf: 优化license的路由判断 2020-09-15 15:14:07 +08:00
ibuler
db0cea7051 feat: 可以设置隐藏工单 2020-09-15 14:55:38 +08:00
OrangeM21
09617fa606 feat: 添加用户界面K8S应用 2020-08-11 16:45:39 +08:00
fit2bot
8f00dbf23e
feat(kubenetes): 添加kubenetes应用 (#292) 
* feat(kubenetes): 添加kubenetes应用

* feat(Kubernetes): 添加K8S应用支持

* feat(Kubernetes): 添加K8S应用支持

Co-authored-by: OrangeM21 <orangemtony@gmail.com>
 2020-08-11 11:01:14 +08:00
OrangeM21
6bf15655b7 perf(ticket): 优化工单细节 
Closes https://github.com/orgs/jumpserver/projects/1
 2020-08-07 12:02:03 +08:00
fit2bot
1f91b9a72f
perf(Router): 优化外链路由 (#268) 
* perf(Router): 优化外链路由

* perf(Router): 优化外链路由

* 替换BASEURL为BASE_URL

Co-authored-by: OrangeM21 <orangemtony@gmail.com>
 2020-07-31 11:57:04 +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
八千流
ad423e921a
fix(highlight): 修复创建资源后跳转到列表页世，左侧菜单没有高亮问题 (#191) 2020-07-15 17:54:11 +08:00
OrangeM21
4927c6520a [fix]抽象路由写法 2020-06-22 18:31:59 +08:00
OrangeM21
7eccb20269 [fix]更新路由权限,更新eslint Ignore 2020-06-22 16:15:56 +08:00
OrangeM21
f9f90e55c1 [fix]修改页面路由权重问题 2020-06-19 15:08:14 +08:00
OrangeM21
5f5474d10f [fix]修改过滤路由参数名称 2020-06-18 00:40:23 +08:00
OrangeM21
f0fbce4543 [fix]过滤路由 2020-06-17 20:55:40 +08:00
Bai
a3aa808468 [Update] 修改平台列表路由高亮 2020-06-12 11:32:39 +08:00
ibuler
a54cbec098 feat: 修改command filter 2020-06-10 13:20:29 +08:00
ibuler
85ba553866 feat: 修改路由 2020-06-09 20:54:26 +08:00
ibuler
b65dfd1e6a feat: 修改用户页面路由 2020-06-09 15:27:42 +08:00
ibuler
f092181b84 feat: 修改网关创建和列表 2020-06-09 15:05:27 +08:00
OrangeM21
576a09f44f [fix]添加密码匣子查看功能,删除重复路由 2020-06-08 12:07:14 +08:00
OrangeM21
549d4d5db5 [add]增加celeryLog界面 2020-06-06 15:39:37 +08:00
ibuler
1d4fb281fb feat: 修改角色切换 2020-06-05 19:10:21 +08:00
Eric
9d87be8744 add task monitor 2020-06-04 15:10:11 +08:00
ibuler
1760d43c9e feat: 修改权限和路由的计算方法 2020-06-04 14:55:07 +08:00
ibuler
622953a7b0 feat: merge 2020-06-03 21:10:00 +08:00
ibuler
333cdfcb4c feat: 修改路由过滤方式 2020-06-03 20:36:46 +08:00
Bai
27c096ccca [Update] 添加用户首次登录页面 3 2020-06-03 18:30:42 +08:00
Bai
e1430eb64b [Update] 添加用户首次登录页面 2 2020-06-03 18:17:32 +08:00
Bai
f13661e9d3 [Update] 添加用户首次登录页面 2020-06-03 18:16:42 +08:00
OrangeM21
da08ba634b [fix]过滤特定路由 2020-06-03 14:11:30 +08:00
ibuler
9493d5c498 feat: vue router使用原生的hash模式 2020-06-01 16:48:22 +08:00
ibuler
e4ba23da8b feat: 修改使用vue router history 模式 2020-06-01 15:58:07 +08:00
ibuler
7de7a9274a feat: 优化asset 弹窗 2020-05-28 20:33:19 +08:00
ibuler
5efd32caae Merge branch 'master' of github.com:jumpserver/lina 2020-05-28 18:56:47 +08:00
ibuler
9d73f2c2fe [Update] Merge it 2020-05-28 18:53:30 +08:00
OrangeM21
a53da35a3b Merge remote-tracking branch 'origin/master' 2020-05-28 18:45:47 +08:00
ibuler
380b0a35ae merge: with master 2020-05-28 18:44:25 +08:00
OrangeM21
8a339db1ae [fix]修复平台列表的Bug 2020-05-28 17:38:32 +08:00
ibuler
ae855ea3f6 merge: with master 2020-05-28 16:13:01 +08:00
ibuler
13589ce9cb feat: 修改actions formatter 使用formatterAegs 2020-05-28 16:06:57 +08:00
Bai
03e9425fc8 [Update] 修改个人信息目录结构 2020-05-28 10:59:13 +08:00
ibuler
dbe17fbc04 [Update] 修改core 2020-05-27 19:29:49 +08:00
Bai
d7447b43cb [Update] 添加UserProfile页面；Nav 添加 userProfile 跳转；routes 添加commonRoutes（userProfile) 2020-05-27 16:59:52 +08:00
ibuler
462bf02fa6 [Feature] 重命名一些组件 2020-05-27 15:45:03 +08:00
ibuler
57fa0bc947 [Feat] 完成重命名Jobcenter 2020-05-27 15:07:10 +08:00
OrangeM21
a23de329ba 【update】修改路径至UI 2020-05-26 19:48:39 +08:00
jym503558564
bbeb070538 Merge branch 'master' of https://github.com/jumpserver/lina 2020-05-25 17:31:31 +08:00
jym503558564
fb1ded679b [fix] 修改一些小问题 2020-05-25 17:31:17 +08:00
Eric
ef76c1bb14 update activeMenu for sessions router 2020-05-25 15:29:18 +08:00
OrangeM21
03c3632bd5 [Fix]修复用户页面URL跳转 2020-05-24 06:32:39 +08:00
OrangeM21
c8f1f2f566 [fix]修资产bug 2020-05-21 14:41:25 +08:00
OrangeM21
59a39d77ec [update]添加用户页面资产 2020-05-20 20:15:41 +08:00
OrangeM21
10d4f1f04a [upate]更新用户界面 2020-05-19 20:10:07 +08:00
OrangeM21
0627199695 [fix]添加用户页面和管理员页面切换 2020-05-19 17:41:47 +08:00
Eric
9835db2c89 Session offline and Online view 2020-05-14 20:47:22 +08:00
Eric_Lee
b84454c503
session detail view (#52) 2020-05-14 19:34:38 +08:00
ibuler
540062fb09 [Update] 去掉默认使用tr的方式，避免i18n extract无法检测 2020-05-14 11:19:01 +08:00
ibuler
2acea9c828 [Update] 移动router位置 2020-05-14 10:32:09 +08:00
ibuler
5f1a6741aa [Update] 移动router位置 2020-05-14 10:29:05 +08:00
OrangeM21
a9ffb87e69 [fix]添加Xpack案例 2020-05-13 19:18:42 +08:00
ibuler
5000bb6d24 [Update] 修改routes 和 i18n 2020-05-13 11:02:36 +08:00
ibuler
18b201bc7b [Update] 修改i18n 2020-05-11 21:06:47 +08:00
OrangeM21
be33034f6a Revert "[update]修改路由引用" 
This reverts commit db47db40eb.
 2020-05-11 11:06:19 +08:00
Orange
db47db40eb [update]修改路由引用 2020-05-10 16:31:48 +08:00
jym503558564
28a8eac1bd [Update] 资产授权详情添加资产 2020-05-09 11:21:22 +08:00
Eric_Lee
e0063f5cd2
update settings (#42) 2020-05-06 18:30:06 +08:00
ibuler
db6720184e [Update] 拆分路由 2020-04-29 20:47:54 +08:00
ibuler
d7ad0d6c41 [Update] 拆分routers 2020-04-29 20:33:45 +08:00
ibuler
6be631f5cb [Update] 修改结构 2020-04-29 19:50:06 +08:00
OrangeM21
a4c7e299aa [update]完善页面 2020-04-29 19:47:45 +08:00
OrangeM21
d154b20de7 [update]抽出下载和导入的Dialog 2020-04-29 14:33:43 +08:00
Orange
cd6751723c
Merge branch 'master' into orange_dev 2020-04-28 16:03:57 +08:00
OrangeM21
f521c103d4 [update]新增AssetSelect组件,有bug,正在修复 2020-04-28 15:09:56 +08:00
Eric_Lee
7ac631a113
update command storage (#37) 2020-04-27 17:57:46 +08:00
Eric_Lee
eaada9a219
replay storage update (#36) 2020-04-27 15:46:00 +08:00
OrangeM21
27cffad5ce [hotfix]移动资产目录 2020-04-26 21:16:10 +08:00
Eric_Lee
938c290e30
create reply storage (#34) 
create command storage
 2020-04-26 19:44:34 +08:00
ibuler
053ac8e12f [Update] 修改分页 2020-04-24 10:07:54 +08:00
Eric_Lee
42a0367443
Dev eric (#26) 
* terminal detail page

* Storage page view
 2020-04-22 20:45:54 +08:00
jym503558564
d010558b3f Merge branch 'master' into jym_dev 2020-04-22 14:51:19 +08:00
OrangeM21
24248b3430 [update]修改AutoDataForm组件以兼容Tree 2020-04-22 02:12:09 +08:00
jym503558564
5f4f959fb0 [Update] 修改权限管理详情组件和任务详情组件 2020-04-21 20:10:29 +08:00
OrangeM21
efd74f2c36 [update]添加命令过滤页面 2020-04-21 20:09:39 +08:00
OrangeM21
a46cb2757e Merge branch 'master' of https://github.com/jumpserver/lina 2020-04-21 15:11:18 +08:00
ibuler
e02f7485b7 [Update] 修订update 2020-04-21 11:47:33 +08:00
OrangeM21
bf849dd8b7 [update]完善平台列表 2020-04-20 20:09:48 +08:00
jym503558564
edb766eefa Merge branch 'master' into jym_dev 2020-04-20 18:35:48 +08:00
jym503558564
9969d404ad [Update] 增加任务模块一些详情组件 2020-04-20 17:27:33 +08:00
Eric_Lee
15c29a4602
terminal detail page (#22) 2020-04-20 13:02:01 +08:00
jym503558564
42cf5b814b [Update] 权限模块修改翻译和路由 2020-04-15 18:00:46 +08:00
jym503558564
db4cc16a55 [Update] 初步实现授权详情 2020-04-15 16:20:18 +08:00
jym503558564
d473635ac9 Merge branch 'master' into jym_dev 2020-04-13 16:45:06 +08:00
jym503558564
83f80f4a6c [Update] 增加资产节点树 2020-04-13 16:42:55 +08:00
Bai
667098b086 [Update] 添加RemoteAppList 2020-04-10 20:16:07 +08:00
Eric_Lee
c59d0fb55e
session detail (#16) 
* [Update] finish session detail

* Web terminal and Web sftp
 2020-04-10 17:37:48 +08:00
ibuler
709e52ea38 [Update] merge 2020-04-09 19:39:24 +08:00
ibuler
f16554bd80 [Update] 调整ui 2020-04-09 19:37:02 +08:00
Eric
a1959fd44a Session detail view link 2020-04-09 19:31:06 +08:00
ibuler
1257511cf4 [Update] 统一名称 2020-04-09 10:56:46 +08:00
jym503558564
0d47d60d0a [Update] 增加权限模块的创建页面 2020-04-08 18:32:47 +08:00
ibuler
aa583d9741 [Update] 修改geneate form 2020-04-08 14:56:34 +08:00
OrangeM21
6ae4fa8b3e Merge branch 'master' of https://github.com/jumpserver/lina 2020-04-07 20:48:10 +08:00
OrangeM21
df420857ad [update]更新HeaderAction 2020-04-07 20:45:51 +08:00
Orange
b4a57ee4c0
Merge pull request #8 from jumpserver/jym_dev 
[Update] 更新一些列表组件
 2020-04-07 20:34:10 +08:00
jym503558564
f3dd7d6666 [Update] 更新删除按钮请求 2020-04-07 20:32:14 +08:00
ibuler
b6526c6989 [Update] 修改自动创建的表单 2020-04-07 18:38:17 +08:00
jym503558564
ddba4764ef Merge branch 'master' into jym_dev 2020-04-07 16:28:51 +08:00
jym503558564
9739306a9e [Update] 增加工单管理列表页组件 2020-04-07 15:41:27 +08:00
jym503558564
7bd7317f41 [Update] 增加网关列表组件 2020-04-07 12:04:27 +08:00
jym503558564
e24d3c021d [Update] 增加任务列表组件 2020-04-07 11:03:00 +08:00
ibuler
901b4a33bf [Update] 修改一些布局 2020-04-07 10:45:37 +08:00
ibuler
0383ea2458 Merge branch 'master' of github.com:jumpserver/lina 2020-04-03 21:03:48 +08:00
OrangeM21
2dee572812 [update]修改表单抽象 2020-04-03 20:51:02 +08:00
ibuler
5d9d87512a [Update] 添加默认更新配置 2020-04-03 15:50:05 +08:00
jym503558564
e28e487cb4 Merge branch 'master' into jym_dev 2020-04-03 12:44:22 +08:00
jym503558564
8cffa2a3e8 [Update] 增加终端管理列表组件 2020-04-03 12:42:16 +08:00
jym503558564
7ce614d72e [Update] 增加命令记录列表组件以及去掉一些组件多余的属性 2020-04-03 12:04:02 +08:00
OrangeM21
6008cae1b5 [fix] 2020-04-03 11:38:15 +08:00
OrangeM21
8274b7d8b0 Merge branch 'master' of https://github.com/jumpserver/lina 2020-04-03 11:36:58 +08:00
OrangeM21
37c64f2f59 [update]更新表格数据 2020-04-03 11:36:55 +08:00
jym503558564
45dcb1e9f5 [Update] 增加在线会话和历史会话列表组件 2020-04-02 18:07:26 +08:00
jym503558564
f2bc4c6bb7 [Update] 增加授权列表组件 2020-04-02 17:05:20 +08:00
jym503558564
3793c484ec [Update] 增加远程应用列表组件 2020-04-02 16:44:01 +08:00
jym503558564
cbfc52adfe [Update] 增加平台列表组件 2020-04-02 16:31:34 +08:00
ibuler
77716f3caf [Update] 修改generic list page 2020-04-02 15:05:21 +08:00
OrangeM21
787c9f359e [update]更新ElFormRender 2020-04-01 16:54:36 +08:00
jym503558564
22ca55973f [Update] 左侧菜单完善 2020-03-30 15:20:12 +08:00
ibuler
2f952a626e [Update] 修改detail page 2020-03-27 15:45:36 +08:00
ibuler
1a88ee5e49 [Update] 更改paging 2020-03-25 21:06:47 +08:00
ibuler
a04ddd62eb [Update] 修改路由 2020-03-23 19:36:17 +08:00
ibuler
b353706245 [Update] 修改菜单 2020-03-23 19:15:17 +08:00
ibuler
0b122aacfd [Update] 优化组件 2020-03-23 18:19:54 +08:00
Orange
89d7668814
Merge pull request #1 from jumpserver/jym_dev 
[Update] 增加一些列表组件
 2020-03-22 21:01:17 +08:00
OrangeM21
e5e44f03db [update]有bug状态 2020-03-22 16:00:33 +08:00
jym503558564
3b19fdf6f0 [Update] 增加命令过滤器列表组件 2020-03-22 11:46:09 +08:00
jym503558564
7dc161da86 [Update] 增加标签列表组件 2020-03-22 11:40:42 +08:00
jym503558564
ccaeaca3db [Update] 增加网域列表组件 2020-03-22 11:35:28 +08:00
jym503558564
4b0b46d23f [Update] 增加系统用户列表组件 2020-03-22 11:27:26 +08:00
jym503558564
5db2301b5d [Update] 增加管理用户列表组件 2020-03-22 11:15:33 +08:00
OrangeM21
224d060671 [update]完成用户组页面组 2020-03-22 01:05:47 +08:00
OrangeM21
cb1b4dd292 [update]完善用户管理模块 2020-03-21 04:47:46 +08:00
OrangeM21
d4a941cd80 [update]修改路由, 通配编辑路由 2020-03-21 04:15:32 +08:00
OrangeM21
ffc9381e39 Merge branch 'master' of https://github.com/orangemio/lina 2020-03-21 01:31:05 +08:00
OrangeM21
6326169ed0 [update]抽出TableList页面 2020-03-21 01:30:52 +08:00
ibuler
695e23b423 [Update] 修改logo 2020-03-20 18:56:34 +08:00
ibuler
34a6c08f2d [Update] 添加路由 2020-03-20 17:59:54 +08:00
OrangeM21
577c9c80c8 [update]进行模型基础抽离 2020-03-20 16:08:03 +08:00
OrangeM21
b5ac73e57f [lina] 2020-03-20 00:46:35 +08:00
Pan
882ba9d148 Revert "remove permission control" 
This reverts commit b6147d33f3.
 2019-04-21 16:03:05 +08:00
Pan
b6147d33f3 remove permission control 2019-04-19 21:27:47 +08:00
花裤衩
a5d4bbda75
[release]4.1.0 (#211) 2019-04-19 20:41:52 +08:00
花裤衩
5d82985a76
perf[chore]: add mock.js to instead of easy-mock (#281) 2019-02-20 13:16:24 +08:00
Pan
5b792c6fe0 feat[Breadcrumb]: add hide Breadcrumb option 2019-01-01 23:21:32 +08:00
Pan
f43c2a9542 fix typos 2018-09-17 17:57:19 +08:00
Pan
a95616f273 tweak spelling mistakes 2018-09-03 15:11:40 +08:00
Pan
61394e573e feature: [sidebar] add external-link 2018-08-24 10:42:37 +08:00
花裤衩
5d769533ac
add: eslint-plugin-vue (#148) 2018-08-20 15:45:15 +08:00
Pan
69eb3ed513 refactor sidebar && add nested demo 2018-07-13 15:02:42 +08:00
Pan
2c7586ccb8 feat[menu]: add alwaysShow option 2018-01-24 15:01:25 +08:00
Pan
cc069d18a4 refactor router 2018-01-11 12:29:14 +08:00
Pan
37b6253e14 feat:add tree demo 2017-11-29 09:55:33 +08:00
Pan
868673778e perf:rm role 2017-11-29 09:55:33 +08:00
Pan
86096e4eab refactor:router&&sidemenu 2017-11-29 09:55:33 +08:00
Pan
890cfe5860 refactor:refine icons 2017-11-29 09:55:33 +08:00
Pan
9abd44f562 refactor: remove_permission-control 2017-10-18 15:05:30 +08:00
Pan
3a3cfcc69a refine : router/index.js 2017-09-15 13:43:52 +08:00
Pan
635a43bae3 add tips 2017-09-12 10:39:58 +08:00
Pan
b44c7384dc refactor 2017-08-30 17:42:06 +08:00
Pan
f6e8859916 rm name 2017-08-29 14:39:59 +08:00
Pan
c51c7fec5f refine 2017-06-28 23:02:22 +08:00
Pan
2bc84413e3 add example page 2017-06-26 18:45:30 +08:00
Pan
472cbb6d65 add easy-mock 2017-06-26 15:43:11 +08:00
Pan
c528bd8ad0 init 2017-06-26 13:38:24 +08:00