github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-06-21 04:41:55 +00:00
Code Issues Projects Releases Wiki Activity
7,276 Commits 96 Branches 216 Tags 34 MiB
pr@dev@feat_ad_domain
Commit Graph

7276 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ibuler
05be3508f1 Merge branch 'master' of github.com:jumpserver/lina 2020-04-19 10:26:04 +08:00
OrangeM21
fdb3195fd7 [update]完善Assets 2020-04-16 18:57:12 +08:00
OrangeM21
3b887c49e1 [update]完成资产列表 2020-04-16 16:42:48 +08:00
OrangeM21
2aa2e2d96a [update]完善ZTree样式 2020-04-16 15:58:05 +08:00
OrangeM21
5ac1d6ac37 [update]完善删除节点 2020-04-16 15:42:44 +08:00
OrangeM21
c0a193a8a1 [update]修复Url问题导致消息无法传递到子组件 2020-04-16 15:15:12 +08:00
八千流
aa3bdeb940
Merge pull request #21 from jumpserver/jym_dev 
[Update] 初步实现授权模块详情
 2020-04-15 18:05:31 +08:00
jym503558564
42cf5b814b [Update] 权限模块修改翻译和路由 2020-04-15 18:00:46 +08:00
OrangeM21
f6efefbc10 [update]抽象Ztree +3 2020-04-15 16:59:18 +08:00
jym503558564
41cf8a6ffb [Update] 去掉树 2020-04-15 16:37:06 +08:00
jym503558564
ec04cec4f4 [Merge] jym_dev merge master 2020-04-15 16:27:38 +08:00
jym503558564
db4cc16a55 [Update] 初步实现授权详情 2020-04-15 16:20:18 +08:00
Orange
15d2bcfc04
Merge pull request #20 from jumpserver/dev_orange 
[update]抽象Ztree +2
 2020-04-15 03:14:37 +08:00
OrangeM21
dd446f49bf [update]抽象Ztree +2 2020-04-15 03:12:22 +08:00
OrangeM21
3f91c8f433 [update]抽象Ztree 2020-04-15 02:59:25 +08:00
OrangeM21
450f98d35f Merge remote-tracking branch 'origin/master' 2020-04-13 19:59:04 +08:00
OrangeM21
e83828dd22 [update]添加Ztree 2020-04-13 19:58:39 +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
BaiJiangJie
920b86ef5b
Merge pull request #19 from jumpserver/bai_master 
[Update] 修改Dialog组件确认出发的事件名: comfirm -> confirm
 2020-04-13 14:55:28 +08:00
Bai
3274b14c4c [Update] 修改Dialog组件确认出发的事件名: comfirm -> confirm 2020-04-13 14:48:21 +08:00
BaiJiangJie
590fa3cef3
Merge pull request #18 from jumpserver/master_bai 
[Update] 添加RemoteAppList
 2020-04-13 10:30:20 +08:00
OrangeM21
d4a4acc089 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/components/TreeNode/index.vue
 2020-04-13 01:58:51 +08:00
OrangeM21
83acf862ff [update]增加treeTable表格同步,修改Tree样式 2020-04-13 01:56:35 +08:00
ibuler
49829cb7b6 [Update] 修改base formatter 2020-04-10 21:03:33 +08:00
Bai
667098b086 [Update] 添加RemoteAppList 2020-04-10 20:16:07 +08:00
ibuler
4cc825c293 [update] 修改默认值 2020-04-10 19:57:20 +08:00
ibuler
abccf531da Merge branch 'master' of github.com:jumpserver/lina 2020-04-10 19:46:14 +08:00
ibuler
59370c7464 [update] 修改默认值 2020-04-10 19:45:46 +08:00
OrangeM21
74e0c118ab Merge branch 'master' of https://github.com/jumpserver/lina 2020-04-10 19:21:41 +08:00
OrangeM21
b71d170331 [update]使has方法可用 2020-04-10 19:21:33 +08:00
ibuler
736fa07e07 [Update] 修改通用组件，提供默认route 2020-04-10 18:56:24 +08:00
ibuler
2fbff953bd [Update] 提供默认值 2020-04-10 18:52:12 +08:00
ibuler
deeea03c12 Merge branch 'master' of github.com:jumpserver/lina 2020-04-10 18:45:13 +08:00
ibuler
3255c079ad [Update] 修改select2 2020-04-10 18:31:35 +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
Orange
23c4050a8e
[fix]去掉Url 2020-04-10 15:57:18 +08:00
OrangeM21
1c499995df Merge branch 'master' of https://github.com/jumpserver/lina 2020-04-10 15:52:25 +08:00
OrangeM21
5050cbbc07 [fix]去掉Url 2020-04-10 15:52:18 +08:00
ibuler
ba9017fb6c Merge branch 'master' of github.com:jumpserver/lina 2020-04-10 15:41:51 +08:00
BaiJiangJie
14d469a652
Merge pull request #15 from jumpserver/master_bai 
[Update] 修改获取用户Profile中管理的组织的变量名
 2020-04-10 15:41:28 +08:00
ibuler
ff5668faea [Update] 用户创建和更新 2020-04-10 15:41:25 +08:00
Bai
a9bd51ceeb [Update] 修改获取用户Profile中管理的组织的变量名 2020-04-10 15:40:24 +08:00
ibuler
79e2afed64 Merge branch 'master' of github.com:jumpserver/lina 2020-04-10 15:40:19 +08:00
ibuler
74b0314956 [Update] 基本完成通用的创建和更新view 2020-04-10 15:40:02 +08:00
OrangeM21
5141a701b6 Merge branch 'master' of https://github.com/jumpserver/lina 2020-04-10 14:54:10 +08:00
OrangeM21
25886b82bf [update]添加treeNode 2020-04-10 14:53:57 +08:00
Eric_Lee
b9fe92f61a
[Update] session detail (#14) 2020-04-10 11:21:24 +08:00