7199 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
OrangeM21	1c9f62f2ec	[fix]	2020-06-07 23:13:07 +08:00
OrangeM21	d536930568	[fix]修复资产模块问题	2020-06-07 22:27:39 +08:00
OrangeM21	549d4d5db5	[add]增加celeryLog界面	2020-06-06 15:39:37 +08:00
OrangeM21	f2ac3cb825	Merge remote-tracking branch 'origin/dev' into dev	2020-06-05 20:28:25 +08:00
OrangeM21	a9716a0fa0	[update]命令执行修复	2020-06-05 20:28:10 +08:00
ibuler	9453e79591	fix: 修改翻译	2020-06-05 20:18:34 +08:00
ibuler	55be5c2520	feat: 添加翻译	2020-06-05 19:31:48 +08:00
ibuler	b7eaa48398	feat: 修改翻译	2020-06-05 19:22:04 +08:00
ibuler	27391d0a63	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-05 19:10:40 +08:00
ibuler	1d4fb281fb	feat: 修改角色切换	2020-06-05 19:10:21 +08:00
OrangeM21	79fe8a4db7	Merge remote-tracking branch 'origin/dev' into dev	2020-06-05 18:54:26 +08:00
ibuler	41a69b1b6b	feat: 修改权限	2020-06-05 18:50:02 +08:00
ibuler	3b02825f0f	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-05 18:40:57 +08:00
ibuler	cccf402398	feat: 修改permission逻辑	2020-06-05 18:40:35 +08:00
OrangeM21	fb12438fe5	[update]修改缓存策略	2020-06-05 18:39:00 +08:00
OrangeM21	3519b1768a	[update]修改缓存策略	2020-06-05 18:36:12 +08:00
ibuler	f6959e6556	feat: merge	2020-06-05 17:57:40 +08:00
ibuler	d215942a44	feat: 修改权限控制	2020-06-05 17:56:18 +08:00
OrangeM21	501c9991cb	[update]添加命令执行功能	2020-06-05 17:13:54 +08:00
Eric	78c86f5a7e	Merge branch 'dev' of https://github.com/jumpserver/lina into dev	2020-06-05 16:19:26 +08:00