github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-06-21 12:47:06 +00:00
Code Issues Projects Releases Wiki Activity
6,986 Commits 96 Branches 216 Tags 34 MiB
pr@dev@risk
Commit Graph

6986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
八千流
07b4adefe0
Merge pull request #13 from jumpserver/jym_dev 
[Update]  资产授权列表显示expand值
 2020-04-09 21:16:47 +08:00
jym503558564
5dea00432c [Merge] Merge 2020-04-09 21:15:19 +08:00
jym503558564
dc07cb15db [Update] 修改el-checkbox翻译显示问题 2020-04-09 21:07:10 +08:00
jym503558564
515964818b [Update] 资产授权列表显示expand值 2020-04-09 21:00:07 +08:00
ibuler
ba54fc2021 [Update] 暂存 2020-04-09 20:48:50 +08:00
OrangeM21
ee1049782d [update]忽略i18n警告 2020-04-09 20:26:37 +08:00
jym503558564
7d36e29f73 Merge branch 'master' into jym_dev 2020-04-09 19:39:28 +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_Lee
c249276243
Merge pull request #12 from jumpserver/dev_eric 
* command list view
* Session detail view link
 2020-04-09 19:33:05 +08:00
Eric
a1959fd44a Session detail view link 2020-04-09 19:31:06 +08:00
Eric
95a373ae68 command list view 2020-04-09 19:31:06 +08:00
jym503558564
371ce287be [Update] 增加刷新授权缓存请求 2020-04-09 17:21:11 +08:00
jym503558564
5370f6c81b [Update] 修改创建资产授权组件中的actions显示为checkbox-group 2020-04-09 16:24:18 +08:00
jym503558564
ebc87b12f7 [Update] 增加资产授权列表的刷新按钮 2020-04-09 14:41:08 +08:00
ibuler
1257511cf4 [Update] 统一名称 2020-04-09 10:56:46 +08:00
ibuler
ba4a828300 [Update] 基本创建成功 2020-04-08 20:35:59 +08:00
八千流
ae366715f3
Merge pull request #11 from jumpserver/jym_dev 
[Update] 修改任务列表组件
 2020-04-08 20:34:31 +08:00
jym503558564
7a0787daaa [Update] 去掉打印数据 2020-04-08 20:28:00 +08:00
jym503558564
1d39709038 Merge branch 'master' into jym_dev 2020-04-08 20:25:36 +08:00
jym503558564
e804ac972a [Update] 修改任务列表组件一些字段的获取 2020-04-08 20:23:59 +08:00
ibuler
cc3ba249b6 [Update] merge 2020-04-08 20:04:09 +08:00
ibuler
e0e34d8eb2 [Update] 修改expand 2020-04-08 20:00:11 +08:00
jym503558564
b02508ef19 [Update] 修改任务列表组件 2020-04-08 19:37:20 +08:00
Orange
69ca0ff08c
Merge pull request #10 from jumpserver/jym_dev 
[Update] 更新授权的列表组件和创建组件
 2020-04-08 18:43:12 +08:00
jym503558564
0d47d60d0a [Update] 增加权限模块的创建页面 2020-04-08 18:32:47 +08:00
Eric_Lee
7a25d126c6
Merge pull request #9 from jumpserver/dev_eric 
session offline and online views
 2020-04-08 18:11:46 +08:00
Eric
b243a9d87f add session api 2020-04-08 18:07:42 +08:00
Eric
337bd2dc41 terminate session action 2020-04-08 18:06:01 +08:00
Eric
aa73b9f89b copy jumpserver.js to common.js 2020-04-08 18:06:01 +08:00
Eric
d0f4126096 session offline and online views 2020-04-08 18:06:01 +08:00
OrangeM21
20612fdb26 Merge branch 'master' of https://github.com/jumpserver/lina 2020-04-08 17:11:19 +08:00
OrangeM21
03af0a150e [update]完成导出导入设置 2020-04-08 17:09:59 +08:00
jym503558564
2e69d96bd4 Merge branch 'master' into jym_dev 2020-04-08 16:57:45 +08:00
ibuler
27346fb891 [Update] 更新fields group 2020-04-08 16:25:59 +08:00
jym503558564
df0ce46290 [Update] 修改授权列表组件页面 2020-04-08 15:58:32 +08:00
ibuler
ecaf74d8ed Merge branch 'master' of github.com:jumpserver/lina 2020-04-08 14:57:12 +08:00
ibuler
aa583d9741 [Update] 修改geneate form 2020-04-08 14:56:34 +08:00
OrangeM21
f70d59a0fb Merge branch 'master' of https://github.com/jumpserver/lina 2020-04-08 14:29:01 +08:00
OrangeM21
33a7c03fc9 [update] 2020-04-08 14:28:54 +08:00