Commit Graph

7276 Commits

Author SHA1 Message Date
ibuler
6be631f5cb [Update] 修改结构 2020-04-29 19:50:06 +08:00
OrangeM21
c8197fba43 Merge branch 'master' of https://github.com/jumpserver/lina 2020-04-29 19:48:00 +08:00
OrangeM21
a4c7e299aa [update]完善页面 2020-04-29 19:47:45 +08:00
ibuler
77b5a83abc [Update] 修改master 2020-04-29 19:07:11 +08:00
ibuler
073d38bd6d [Update] 修改detail 逻辑 2020-04-29 18:44:34 +08:00
OrangeM21
9ac47cef98 [update]完善页面 2020-04-29 16:56:12 +08:00
OrangeM21
d154b20de7 [update]抽出下载和导入的Dialog 2020-04-29 14:33:43 +08:00
ibuler
b21d2d756d [Update] 拆分 detail 2020-04-29 11:07:43 +08:00
ibuler
bdfe371000 Merge branch 'master' of github.com:jumpserver/lina 2020-04-29 10:39:12 +08:00
ibuler
7d6d4cfc00 [Update] 修改代理 2020-04-29 10:38:46 +08:00
Orange
c16ba38169
Merge pull request #39 from jumpserver/orange_dev
[update]添加表格组件
2020-04-28 16:04:07 +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
八千流
bd02412894
Merge pull request #38 from jumpserver/jym_dev
[Update] 更改任务详情组件
2020-04-27 20:01:05 +08:00
jym503558564
7ca5444ff7 [Update] 更改任务详情组件 2020-04-27 19:58:22 +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
ibuler
d8ba9d2bde [Update] 修改通过创建更新页面 2020-04-27 13:59:26 +08:00
ibuler
153129fc91 [Update] 修改通过创建更新页面 2020-04-27 13:58:06 +08:00
ibuler
fb41e04543 [Update] create update page 获取Util 2020-04-27 13:52:51 +08:00
ibuler
99f957b48c [Update] 修改list table 2020-04-27 13:46:16 +08:00
ibuler
e25b4cc33f Merge branch 'master' of github.com:jumpserver/lina 2020-04-27 10:55:08 +08:00
ibuler
e6a48aea0f [Update] 级别完成relaction card 2020-04-27 10:53:42 +08:00
OrangeM21
27cffad5ce [hotfix]移动资产目录 2020-04-26 21:16:10 +08:00
八千流
30899d4486
Merge pull request #35 from jumpserver/jym_dev
[Update] 更新ActiveCard更新提示
2020-04-26 20:31:47 +08:00
jym503558564
5eb57558de [Update] 更新ActiveCard更新提示 2020-04-26 20:30:37 +08:00
ibuler
25a585cd5a Merge branch 'master' of github.com:jumpserver/lina 2020-04-26 20:23:21 +08:00
ibuler
f4941358ca [Update] 修改select2 2020-04-26 20:22:53 +08:00
OrangeM21
bcfd6d4da3 Merge remote-tracking branch 'origin/master' 2020-04-26 20:17:14 +08:00
ibuler
e3766addb9 Merge branch 'master' of github.com:jumpserver/lina 2020-04-26 20:12:10 +08:00
ibuler
4041e2279b [Bugfix] 修复select 弱引用问题 2020-04-26 20:11:39 +08:00
OrangeM21
34673f3e7a [hotfix]抽象搜索组件 2020-04-26 20:03:42 +08:00
OrangeM21
f39cd4a65b [hotfix]抽象搜索组件 2020-04-26 19:50:25 +08:00
Eric_Lee
938c290e30
create reply storage (#34)
create command storage
2020-04-26 19:44:34 +08:00
ibuler
ae6459f92b [Update] 添加help text 2020-04-26 19:35:32 +08:00
ibuler
159e1d85df Merge branch 'master' of github.com:jumpserver/lina 2020-04-26 15:46:30 +08:00
ibuler
8e4c6ddd2f [Update] generic update add clean form value 2020-04-26 15:45:06 +08:00
八千流
78b7528a4b
Merge pull request #33 from jumpserver/jym_dev
[Update] 授权详情中tab列表增加删除动作,以前切换tab,控制右上角的删除和修改的显示和隐藏
2020-04-26 14:43:28 +08:00
jym503558564
a21fecf24a [Update] 授权详情中tab列表增加删除动作,以前切换tab,控制右上角的删除和修改的显示和隐藏 2020-04-26 14:33:48 +08:00
ibuler
603867d839 [Update] 修改relation card 2020-04-26 14:25:03 +08:00
Eric
252ff3d9c0 修改storage 2020-04-26 11:31:44 +08:00
jym503558564
8a629ce7f3 Merge branch 'master' into jym_dev 2020-04-26 11:04:08 +08:00
Eric
4ac43ca708 [Update] 修改 action formatter 2020-04-26 11:00:25 +08:00
ibuler
9a29bc19ce [Update] 修改action formator 2020-04-26 10:45:48 +08:00
ibuler
7b6a8878fb [Update] 修改action formattor 2020-04-26 10:31:28 +08:00
ibuler
4accd55600 Merge remote-tracking branch 'origin/card' 2020-04-26 10:22:04 +08:00
ibuler
606cddbc40 Merge branch 'master' of github.com:jumpserver/lina 2020-04-26 10:16:04 +08:00
ibuler
b55cc3ce9f [Update] stash card 2020-04-26 08:59:17 +08:00
Eric_Lee
d847c1ca7e
Dev eric (#32)
* fix more action

* add customActionsFormatter
2020-04-24 17:41:59 +08:00
ibuler
ec3bd29153 [Update] Table换个风格 2020-04-24 10:52:30 +08:00