2269 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ibuler	0c9507645b	feat: 修复formatter args的错误	2020-06-01 11:39:37 +08:00
ibuler	20f4b12e4f	fix: 修改startup service	2020-06-01 11:37:15 +08:00
ibuler	b39a85af58	feat: 添加log	2020-06-01 11:03:38 +08:00
ibuler	4615128b39	feat: 优化写法	2020-06-01 11:00:30 +08:00
ibuler	737e3f8d54	[Update] 优化startup service	2020-06-01 10:41:50 +08:00
ibuler	c915d5fc02	[Update] 优化startup service	2020-06-01 10:26:47 +08:00
ibuler	fa68f329bf	[Update] 修改iconfig	2020-05-29 21:06:20 +08:00
ibuler	8b95a5fdf9	merge: with master	2020-05-29 20:41:55 +08:00
ibuler	f456dff551	[Update] 修改asset select2	2020-05-29 20:37:23 +08:00
BaiJiangJie	85dc04ccf1	Merge pull request #73 from jumpserver/i18n_profile ... I18n profile	2020-05-29 20:12:01 +08:00
Bai	26283e2a6d	[Update] 修改profile-sshkey翻译信息	2020-05-29 19:51:00 +08:00
Bai	49bfe5e4bb	[Update] 修改profile-info翻译信息	2020-05-29 19:21:23 +08:00
OrangeM21	54719b0a13	Merge remote-tracking branch 'origin/master'	2020-05-29 19:11:15 +08:00
OrangeM21	c7e57198ac	[fix]用户升级	2020-05-29 19:11:00 +08:00
BaiJiangJie	5532bf8903	Merge pull request #72 from jumpserver/i18n_bai ... I18n change auth plan	2020-05-29 18:43:21 +08:00
Bai	202985a942	[Update] 修改改密计划翻译（执行计划页面）	2020-05-29 18:42:16 +08:00
Orange	25cab3f741	Merge pull request #71 from jumpserver/orange_tmp ... [update]添加根据时间搜索条	2020-05-29 18:04:56 +08:00
OrangeM21	995553c79e	[update]添加根据时间搜索条	2020-05-29 18:02:28 +08:00
xinwen	69083d3759	[Update] 修改一些 i18n	2020-05-29 17:33:07 +08:00
Bai	49331deaa8	Merge branch 'master' into i18n_bai	2020-05-29 17:26:35 +08:00
BaiJiangJie	a90c43010d	Merge pull request #70 from jumpserver/bugfix_autodatatable ... [Update] 修改ActionsFormatter问题	2020-05-29 17:24:32 +08:00
Bai	0be7cf910d	[Update] Merge from master to bugfix_autodatatable!	2020-05-29 17:23:24 +08:00
Bai	06eae02750	[Update] 修改ActionsFormatter问题	2020-05-29 17:17:05 +08:00
Bai	305bbaa270	[Update] 修改改密计划翻译（详情页面）	2020-05-29 17:12:09 +08:00
xinwen	21b9a9c14a	[Fix] 修复 Formatter bug	2020-05-29 16:56:42 +08:00
xinwen	84e143387c	[Update] 添加一些 i18n	2020-05-29 16:56:17 +08:00
Bai	7f55565f8d	[Update] 修改改密计划翻译（创建更新页面）	2020-05-29 16:21:08 +08:00
xinwen	59b4b80404	[Update] 调整日志审计	2020-05-29 16:17:46 +08:00
Bai	e6ffec5386	[Update] 修改改密计划路由结构；修改改密计划列表页面翻译；	2020-05-29 15:57:48 +08:00
BaiJiangJie	becb7b6f03	Merge pull request #69 from jumpserver/bugfix_actionformatter ... [Update] 修改AutoDataTable构造actions col时去掉actions, 添加formatterArgs	2020-05-29 15:38:50 +08:00
Bai	27c16c25e7	[Update] 修改AutoDataTable构造actions col时去掉actions, 添加formatterArgs	2020-05-29 15:38:05 +08:00
xinwen	41dba3d5c2	[Update] 处理一些 i18n	2020-05-29 15:14:26 +08:00
xinwen	9811217312	[Update] 添加一些 i18n	2020-05-29 14:41:13 +08:00
xinwen	8e35ff3db9	[Update] 添加 xpack-> gatheruser i18n	2020-05-29 12:01:49 +08:00
xinwen	35cca6a00d	[Update] 添加 xpack-> cloud i18n en	2020-05-29 11:41:26 +08:00
xinwen	617e365a0f	[Fix] 详情页Tab Bug	2020-05-29 11:10:56 +08:00
ibuler	2efd303323	merge: with origin	2020-05-29 10:59:03 +08:00
ibuler	6bbde66516	feat: 修改一些拼写错误	2020-05-29 10:54:56 +08:00
BaiJiangJie	296b7dbf37	Merge pull request #68 from jumpserver/api_key ... [Update] 更新API-key列表	2020-05-28 20:46:48 +08:00
Bai	774462ac04	[Update] 更新API-key列表	2020-05-28 20:45:43 +08:00
ibuler	7de7a9274a	feat: 优化asset 弹窗	2020-05-28 20:33:19 +08:00
OrangeM21	eed6d82d46	Merge remote-tracking branch 'origin/master'	2020-05-28 20:32:08 +08:00
OrangeM21	e92d29c2a7	[fix]添加系统用户详情页命令过滤卡片组件	2020-05-28 20:31:39 +08:00
ibuler	5efd32caae	Merge branch 'master' of github.com:jumpserver/lina	2020-05-28 18:56:47 +08:00
jym503558564	8bb68369e4	[Update] 需改授权列表组件跳转到指定tab详情	2020-05-28 18:56:30 +08:00
ibuler	9d73f2c2fe	[Update] Merge it	2020-05-28 18:53:30 +08:00
OrangeM21	a53da35a3b	Merge remote-tracking branch 'origin/master'	2020-05-28 18:45:47 +08:00
ibuler	380b0a35ae	merge: with master	2020-05-28 18:44:25 +08:00
OrangeM21	fa452c5598	[fix]添加资产详情页面测试Dialog	2020-05-28 18:42:54 +08:00
ibuler	a0633e3a0d	[Update] 修改一些formatter格式	2020-05-28 18:42:43 +08:00