6986 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
ibuler	824f96e479	[Update] 修改tab page逻辑，避免刷新回到第一个tab	2020-05-09 19:44:39 +08:00
Orange	64808e45b4	Merge pull request #48 from jumpserver/orange_dev ... [update]完成详情页设置，修改tree结构	2020-05-09 19:29:01 +08:00
Orange	58e384d1b8	Merge branch 'master' into orange_dev	2020-05-09 19:23:07 +08:00
OrangeM21	fe7c3bb1f9	Revert "[update]完成详情页设置，修改tree结构" ... This reverts commit 1ba5fae9	2020-05-09 19:01:05 +08:00
OrangeM21	1ba5fae985	[update]完成详情页设置，修改tree结构	2020-05-09 18:59:01 +08:00
jym503558564	be48d53d20	[Update] 修改资产授权的显示字段	2020-05-09 18:46:26 +08:00
OrangeM21	b49340b6d0	[update]完成详情页设置，修改tree结构	2020-05-09 18:05:12 +08:00
ibuler	6c2f50c6d2	[Update] 修改激活禁用	2020-05-09 17:04:32 +08:00
ibuler	c21e761d1a	[Update] 修改detail formatter引起的bug	2020-05-09 15:11:59 +08:00
ibuler	a9db2a0b7e	[Update] merge it	2020-05-09 14:59:12 +08:00
jym503558564	4f9c60dc5f	Merge branch 'master' of https://github.com/jumpserver/lina	2020-05-09 14:35:19 +08:00
jym503558564	105fa3818e	[Update] 拆分资产授权列表和资产树	2020-05-09 14:33:01 +08:00
Orange	46565769c5	[update]修改翻译格式	2020-05-09 14:26:30 +08:00
Orange	f628e8090c	[update]修改翻译格式	2020-05-09 14:25:41 +08:00
Orange	54e009b62c	[update] 修改翻译格式	2020-05-09 14:24:38 +08:00
OrangeM21	dbe032f9ad	[update]翻译修改为JSon格式	2020-05-09 14:21:17 +08:00
OrangeM21	cf08cb1db9	[update]修改Tree组件结构	2020-05-09 12:29:52 +08:00
Eric	6007972da2	Ldap setting view: handle error msg	2020-05-09 11:34:45 +08:00
ibuler	603edfc5c1	[Update] 补充user detail中组件	2020-05-09 11:32:01 +08:00
jym503558564	d9495682a8	Merge branch 'master' of https://github.com/jumpserver/lina	2020-05-09 11:21:53 +08:00
jym503558564	28a8eac1bd	[Update] 资产授权详情添加资产	2020-05-09 11:21:22 +08:00
Eric	ad9a656267	fix ldap button i18n	2020-05-09 10:36:17 +08:00
Eric_Lee	228f478848	ldap settings (#47)	2020-05-09 10:31:04 +08:00
ibuler	5ebda711e6	Merge branch 'master' of github.com:jumpserver/lina	2020-05-08 21:06:12 +08:00
ibuler	d8ec817c51	[Update] 修改封装授权的资产comp	2020-05-08 21:04:45 +08:00
xinwen	09c2f2e349	[Add] DateFormatter	2020-05-08 21:03:40 +08:00
ibuler	f1cf66fd12	[Update] 修改一些翻译	2020-05-08 20:28:15 +08:00
OrangeM21	b44f15faaf	[update]修改i18n格式为Json	2020-05-08 20:05:35 +08:00
ibuler	e30811a656	[Update] 修改i18n	2020-05-08 20:03:23 +08:00
ibuler	311e6676f2	Merge branch 'master' of github.com:jumpserver/lina	2020-05-08 19:54:52 +08:00
ibuler	9d0bdd5f69	[Update] 修改i18n风格	2020-05-08 19:54:32 +08:00
jym503558564	fcd319d1ea	[Update] 去掉一些console.log	2020-05-08 19:38:34 +08:00