6986 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
ibuler	2c73d3fd43	fix: 修复select2默认值不全的问题	2020-06-05 15:40:04 +08:00
ibuler	5fa9b1a3d0	fix: 修复select2默认值不全的问题	2020-06-05 15:39:27 +08:00
OrangeM21	312642d83f	[fix]更新Tree右键菜单参数	2020-06-05 15:08:56 +08:00
ibuler	ead46856a3	fix: 修改toggletable的报错	2020-06-05 14:49:30 +08:00
Eric	67b074b2b3	add loading actions formatter	2020-06-05 14:39:21 +08:00
ibuler	6f439751cb	fix: 修改自动生成的数据搜索,修改command execution日志列表	2020-06-05 14:29:16 +08:00
OrangeM21	c995604757	[fix]修复引用Ztree问题	2020-06-05 14:24:37 +08:00
OrangeM21	2c93ddbf25	Merge remote-tracking branch 'origin/dev' into dev	2020-06-05 14:21:58 +08:00
OrangeM21	edb1105e9e	[fix]修复引用Ztree问题	2020-06-05 14:21:42 +08:00
xinwen	be0a95ed56	[Fix] xpack/Cloud/Account/Update activeMenu	2020-06-05 14:21:18 +08:00
OrangeM21	0a41180c68	[fix]修复引用Ztree路径问题	2020-06-05 13:58:23 +08:00
ibuler	304b64c1b7	feat: 修改detail	2020-06-05 13:12:33 +08:00
ibuler	56170f67a1	feat: 去掉debug信息	2020-06-05 12:05:17 +08:00