Commit Graph

2269 Commits

Author SHA1 Message Date
ibuler
fd95b0cd4e feat: 修改用户详情中的一个bug 2020-06-09 15:43:52 +08:00
Eric_Lee
df006460b6
asset perms search (#90) 2020-06-09 15:38:43 +08:00
ibuler
caf9a64d7e feat: remote apps添加helpmessages 2020-06-09 15:36:07 +08:00
xinwen
3cd1a9cb0e [Fix] Xpack-云管中心-同步实例任务列表-单击某个同步实例任务-没有可执行的按钮功能 2020-06-09 15:32:22 +08:00
ibuler
b65dfd1e6a feat: 修改用户页面路由 2020-06-09 15:27:42 +08:00
ibuler
a8c0c7f014 feat: 修改我的资产布局 2020-06-09 15:20:55 +08:00
ibuler
756a2dbd3b feat: 修改资产详情中布局的宽度 2020-06-09 15:14:54 +08:00
ibuler
c59383171b Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-09 15:09:57 +08:00
ibuler
f092181b84 feat: 修改网关创建和列表 2020-06-09 15:05:27 +08:00
Bai
baa9f3f7b5 [Update] 移动rMenu从TreeTable到AssetList页面 2020-06-09 14:47:57 +08:00
xinwen
27fc745cf4 [Fix] 作业中心/任务列表/任务详情/执行历史/历史不能进入详情 2020-06-09 14:21:20 +08:00
Eric
509ae8ea6b remove customSettings and get logo urls from publicSettings 2020-06-09 14:08:15 +08:00
xinwen
cd91ca5caf [Fix] 作业中心/任务列表/任务详情/任务各版本/不能进入详情 2020-06-09 11:46:47 +08:00
xinwen
e073256471 [Update] X-Pack 收集用户/任务列表 添加执行按钮 2020-06-09 11:46:47 +08:00
BaiJiangJie
bcf3f1415d
Merge pull request #89 from jumpserver/dev_treermenu
Dev Tree rMenu
2020-06-09 11:04:06 +08:00
Eric
a7edfb52d8 modify api url 2020-06-09 11:01:59 +08:00
Bai
ac09a57684 [Update] Merge branch from dev to dev_treermenu 2020-06-09 11:00:21 +08:00
ibuler
8be168741c Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-09 10:16:32 +08:00
ibuler
bb1ba47856 feat: 修改asset user table 2020-06-09 10:14:42 +08:00
OrangeM21
192944ba8b [fix]更新云管中心 2020-06-08 20:59:24 +08:00
OrangeM21
887b1a7a9d [fix]更新云管中心 2020-06-08 20:57:23 +08:00
ibuler
ab03712220 feat: 将asset user table抽出来 2020-06-08 20:05:37 +08:00
xinwen
d50e25c432 [Fix] Xpack-云管中心-创建同步实例后单击该同步实例名称不能跳转至详情页 2020-06-08 18:12:05 +08:00
ibuler
1f3a508155 feat: 将asset user抽出来 2020-06-08 17:14:40 +08:00
xinwen
54208aad75 [Update] 调整登录审批 2020-06-08 17:12:50 +08:00
xinwen
87c4dd2a86 [Feature] 添加用户登录审批人 2020-06-08 17:05:33 +08:00
Bai
937d139a6b [Update] 添加显示节点信息的执行逻辑 2020-06-08 16:41:32 +08:00
ibuler
dd1c0790d7 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-08 15:23:03 +08:00
ibuler
eef985d465 feat: 添加从节点移除 2020-06-08 15:22:29 +08:00
Bai
8da771af3f [Update] 添加切换显示当前节点/所有子节点资产的执行逻辑 2020-06-08 15:20:40 +08:00
ibuler
92e846584b feat: 修改asset create中admin user的提示 2020-06-08 14:57:57 +08:00
Bai
0f46584a15 [Update] 添加测试节点资产可连接性执行逻辑 2020-06-08 14:06:02 +08:00
Bai
b29a61b792 [Update] 添加更新节点资产硬件信息执行逻辑 2020-06-08 14:02:59 +08:00
Eric
0d38b4fb2c add missing i18n 2020-06-08 14:00:37 +08:00
ibuler
60e705f061 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-08 13:47:26 +08:00
ibuler
b0f0c55063 feat: 优化创建是选择默认的资产和节点 feat: 优化protocols选择 2020-06-08 13:41:01 +08:00
Orange
96dc3c36db
Merge pull request #88 from jumpserver/feature-xpack-vault
Feature xpack vault
2020-06-08 12:10:05 +08:00
OrangeM21
576a09f44f [fix]添加密码匣子查看功能,删除重复路由 2020-06-08 12:07:14 +08:00
Bai
a2b88067c3 [Update] 补充添加资产树节点右击菜单 2020-06-08 12:05:43 +08:00
Eric
21d3875adb add required en/zh msg 2020-06-08 11:42:59 +08:00
Eric
1d6c2fc28d add required en/zh msg 2020-06-08 11:39:55 +08:00
ibuler
1ec46d11ce feat: remote app创建添加 default path 2020-06-08 11:16:08 +08:00
OrangeM21
c0ad1fdb32 [fix]完善网关测试连接性 2020-06-08 10:50:57 +08:00
Bai
8b84a03bfe [Update] fix warning 2020-06-08 10:35:33 +08:00
ibuler
60d9998b29 feat: merge 2020-06-08 10:26:28 +08:00
Orange
91aa25aca3
Merge pull request #86 from jumpserver/fix-assets-bugs
Fix assets bugs
2020-06-08 00:38:23 +08:00
OrangeM21
e4934553b5 [fix] 2020-06-08 00:31:51 +08:00
OrangeM21
2c5f39906a [fix] 2020-06-08 00:28:01 +08:00
OrangeM21
634c81d8e6 [fix] 2020-06-08 00:24:55 +08:00
OrangeM21
ba40a7497c [fix] 2020-06-08 00:16:23 +08:00