718 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
jym503558564	1b0b67b2b5	[Merge] 合并冲突	2020-05-13 14:53:59 +08:00
jym503558564	6d476230e2	[Update] 修改工单详情组件	2020-05-13 14:51:09 +08:00
ibuler	8fd8edf845	[Update] 修改了翻译	2020-05-13 14:41:28 +08:00
ibuler	12cd5d863c	[Update] 整理代码	2020-05-13 11:04:53 +08:00
ibuler	a120438584	Merge branch 'master' of github.com:jumpserver/lina	2020-05-13 11:03:03 +08:00
ibuler	5000bb6d24	[Update] 修改routes 和 i18n	2020-05-13 11:02:36 +08:00
OrangeM21	e65da0e1cf	Merge remote-tracking branch 'origin/master'	2020-05-12 20:41:32 +08:00
OrangeM21	08f84a73a0	[fix]完善Assets	2020-05-12 20:41:07 +08:00
jym503558564	6699082f9a	Merge branch 'master' of https://github.com/jumpserver/lina	2020-05-12 19:42:32 +08:00
jym503558564	d7feb3dac4	[Update] 初步实现工单管理详情组件	2020-05-12 19:42:14 +08:00
xinwen	712118281b	[Add] applications remoteapp 添加应用新增功能	2020-05-12 18:47:30 +08:00
xinwen	6a3127c52c	[Update] i18n cn applications	2020-05-12 16:33:42 +08:00
xinwen	df4538f782	[Add] 创建 applications RemoteApp	2020-05-12 16:30:32 +08:00
ibuler	743ed34b54	[Update] 完成用户模块	2020-05-12 14:28:56 +08:00
ibuler	fd3b19a277	[Update] 修改翻译	2020-05-12 13:24:10 +08:00
Eric	cc56486845	ticket list	2020-05-12 13:00:11 +08:00
ibuler	aafffd1f56	[Update] 拆分i18n	2020-05-12 11:43:01 +08:00
ibuler	bd9f22d921	Merge branch 'master' of github.com:jumpserver/lina	2020-05-12 11:28:21 +08:00
ibuler	4da8085c03	[Update] 修改i18n	2020-05-12 11:26:21 +08:00
OrangeM21	da19464b36	[fix]添加Tree Loading	2020-05-12 02:32:12 +08:00
OrangeM21	b20f837714	[fix]修复高度问题	2020-05-12 01:53:53 +08:00
OrangeM21	31e653d0fc	[fix]完成网关列表	2020-05-12 01:42:28 +08:00
OrangeM21	02885e3df4	[fix]完成网关列表	2020-05-12 01:30:16 +08:00
OrangeM21	f4f8cdff74	Merge remote-tracking branch 'origin/master'	2020-05-12 00:23:56 +08:00
OrangeM21	c1734090c5	[fix]完成网关列表	2020-05-12 00:23:35 +08:00
ibuler	01db6e2a3d	Merge branch 'master' of github.com:jumpserver/lina	2020-05-11 21:07:18 +08:00
ibuler	18b201bc7b	[Update] 修改i18n	2020-05-11 21:06:47 +08:00
jym503558564	67e534aafd	Merge branch 'master' of https://github.com/jumpserver/lina	2020-05-11 20:13:53 +08:00
jym503558564	d07d91c67c	[Update] 增加远程应用详情组件	2020-05-11 20:13:17 +08:00
OrangeM21	594102d03c	Merge remote-tracking branch 'origin/master'	2020-05-11 20:11:55 +08:00
OrangeM21	5d160c4e6d	[fix]完成命令过滤列表	2020-05-11 20:11:21 +08:00
jym503558564	e7ee350b0c	[Update] 修改application的activeMenu	2020-05-11 19:36:39 +08:00
OrangeM21	d925c07d9e	[fix]完成命令过滤	2020-05-11 19:22:08 +08:00
jym503558564	2453772902	[Update] 完成数据库应用组件	2020-05-11 18:51:45 +08:00
xinwen	276f5ffc92	[Add] 添加 applications DatabaseApp	2020-05-11 16:08:29 +08:00
ibuler	6de50f1e00	[Update] 去掉i18n的过度包装	2020-05-11 15:58:13 +08:00
ibuler	ea2929b965	[Update] Remove i18n/index.js	2020-05-11 15:38:36 +08:00
ibuler	bb5585bd0c	[Bugfix] 修复relation card的bug	2020-05-11 15:37:03 +08:00
OrangeM21	eda1801f8b	[fix]资产模块添加ActiveMenu	2020-05-11 14:33:50 +08:00
ibuler	60f174fe0e	[Update] 修改时间日期i18n	2020-05-11 14:20:15 +08:00
ibuler	1dafaf12aa	Merge branch 'master' of github.com:jumpserver/lina	2020-05-11 12:06:50 +08:00
OrangeM21	86c1d7a7a0	[fix]修改i18n,更新语言环境至localstorage	2020-05-11 12:06:23 +08:00
ibuler	a9efa7a3ca	Merge branch 'master' of github.com:jumpserver/lina	2020-05-11 12:00:17 +08:00
ibuler	ebc92b4f9c	[Update] 修改i18n	2020-05-11 11:51:36 +08:00
OrangeM21	be33034f6a	Revert "[update]修改路由引用" ... This reverts commit db47db40eb.	2020-05-11 11:06:19 +08:00
ibuler	2bc56d89d8	Merge branch 'master' of github.com:jumpserver/lina	2020-05-11 10:39:52 +08:00
ibuler	e4c2cd1f5a	[Update] Merge	2020-05-11 10:38:18 +08:00
jym503558564	549a9b681c	[Update] 删除ActiveCard，使用QuickActions	2020-05-11 10:37:27 +08:00
Orange	db47db40eb	[update]修改路由引用	2020-05-10 16:31:48 +08:00
ibuler	db71e44167	Merge branch 'master' of github.com:jumpserver/lina	2020-05-09 19:44:52 +08:00