Commit Graph

2269 Commits

Author SHA1 Message Date
ibuler
a6b3410ff6 [Update] Remove debug msg 2020-04-23 20:53:34 +08:00
ibuler
6ed5123d21 [Update] remove click 2020-04-23 20:50:09 +08:00
ibuler
2aefcf6ee5 [Update] Merge with master 2020-04-23 20:48:31 +08:00
ibuler
c7be48a62e [Update] 优化actions 2020-04-23 20:46:34 +08:00
ibuler
8442218e04 [Update] 优化select2 2020-04-23 19:12:09 +08:00
Orange
336242dd07
Merge pull request #30 from jumpserver/orange_dev
[hotfix]修改搜索组件
2020-04-23 17:19:00 +08:00
OrangeM21
c8d6afc7c2 [hotfix]修改搜索组件 2020-04-23 17:17:32 +08:00
Orange
875213968f
Merge pull request #29 from jumpserver/orange_dev
[update]修改搜索组件
2020-04-23 16:43:19 +08:00
OrangeM21
ffa49b6acf [update]修改搜索组件 2020-04-23 16:24:57 +08:00
OrangeM21
1159201b30 [update]修改搜索组件 2020-04-23 16:23:39 +08:00
八千流
cabddf577a
Merge pull request #28 from jumpserver/jym_dev
[Update] 修改一些详情组件
2020-04-23 16:16:07 +08:00
jym503558564
2244d7fede [Update] 修改一些详情组件 2020-04-23 16:10:26 +08:00
八千流
3d8f315a9b
Merge pull request #27 from jumpserver/jym_dev
[Update] 资产授权增加资产树
2020-04-23 14:23:32 +08:00
jym503558564
1d21c0f3ea [Update] 资产授权增加资产树 2020-04-23 14:18:34 +08:00
Eric_Lee
42a0367443
Dev eric (#26)
* terminal detail page

* Storage page view
2020-04-22 20:45:54 +08:00
ibuler
30e455f90a Merge branch 'master' of github.com:jumpserver/lina 2020-04-22 17:44:03 +08:00
ibuler
7975c0d098 [Update] 重命名tab page 2020-04-22 17:43:30 +08:00
八千流
7c3351c81e
Merge pull request #25 from jumpserver/jym_dev
Jym dev
2020-04-22 14:54:28 +08:00
jym503558564
d010558b3f Merge branch 'master' into jym_dev 2020-04-22 14:51:19 +08:00
jym503558564
f33c8d797b [Update] 增加ActiveCard 2020-04-22 14:49:45 +08:00
ibuler
cefa54c9db [Update] 修改select, 逻辑单一 2020-04-22 13:35:22 +08:00
Orange
1c28e885cb
Merge pull request #24 from jumpserver/orange_dev
[update]修改AutoDataForm组件以兼容Tree
2020-04-22 12:01:05 +08:00
jym503558564
37fb3bbee2 Merge branch 'master' into jym_dev 2020-04-22 10:00:20 +08:00
OrangeM21
24248b3430 [update]修改AutoDataForm组件以兼容Tree 2020-04-22 02:12:09 +08:00
ibuler
a67e06d764 [Update] 修改relation组件 2020-04-21 21:03:45 +08:00
jym503558564
5f4f959fb0 [Update] 修改权限管理详情组件和任务详情组件 2020-04-21 20:10:29 +08:00
OrangeM21
efd74f2c36 [update]添加命令过滤页面 2020-04-21 20:09:39 +08:00
ibuler
35e006b594 Merge branch 'master' of github.com:jumpserver/lina 2020-04-21 15:38:18 +08:00
ibuler
f5aab354d0 [Update] 修改菜单 2020-04-21 15:36:48 +08:00
OrangeM21
a46cb2757e Merge branch 'master' of https://github.com/jumpserver/lina 2020-04-21 15:11:18 +08:00
ibuler
818a8ba6e4 [Update] 添加tab click 2020-04-21 15:03:20 +08:00
ibuler
b4aac49eb1 [Update] 修改generic detail 2020-04-21 14:36:49 +08:00
ibuler
668ac84e8a [Update] 修改详情页 2020-04-21 13:29:27 +08:00
ibuler
e02f7485b7 [Update] 修订update 2020-04-21 11:47:33 +08:00
OrangeM21
8d40492e91 [update]完善平台列表 2020-04-20 20:13:28 +08:00
OrangeM21
bf849dd8b7 [update]完善平台列表 2020-04-20 20:09:48 +08:00
ibuler
d949d87cdd [Update] 添加lodash到全局 2020-04-20 19:55:07 +08:00
ibuler
3986932ccd Merge branch 'master' of github.com:jumpserver/lina 2020-04-20 19:05:11 +08:00
ibuler
da55994a2d [Update] 改变link的默认颜色 2020-04-20 19:04:39 +08:00
ibuler
73bd10d5af [Update] 使用自己生成的theme 2020-04-20 18:55:48 +08:00
八千流
fdf0b34e71
Merge pull request #23 from jumpserver/jym_dev
[Update] 增加任务详情组件和修改授权详情组件
2020-04-20 18:37:37 +08:00
jym503558564
edb766eefa Merge branch 'master' into jym_dev 2020-04-20 18:35:48 +08:00
jym503558564
2b345beb6b [Update] 修改授权组件详情 2020-04-20 18:34:22 +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
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