7199 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Orange	92ff7ef784	Merge pull request #76 from jumpserver/master ... [fix]修复时间过滤异常及创建资产异常	2020-06-01 17:07:34 +08:00
ibuler	9493d5c498	feat: vue router使用原生的hash模式	2020-06-01 16:48:22 +08:00
OrangeM21	70c349d34f	[fix]修复创建资产组件异常	2020-06-01 16:46:44 +08:00
OrangeM21	0b943131b6	【update】完成时间选择组件	2020-06-01 16:16:45 +08:00
ibuler	5fc385421a	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-01 15:58:26 +08:00
ibuler	e4ba23da8b	feat: 修改使用vue router history 模式	2020-06-01 15:58:07 +08:00
BaiJiangJie	f002e94d71	Merge pull request #75 from jumpserver/dev_profile ... [Update] i18n添加profile/api key list en翻译	2020-06-01 15:57:00 +08:00
OrangeM21	57a95d10d6	[update]完成时间组件，待测试。	2020-06-01 15:56:53 +08:00
Bai	551fc3dfaf	[Update] i18n添加profile/api key list en翻译	2020-06-01 15:56:16 +08:00
ibuler	bfec08a4c3	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-01 15:55:23 +08:00
ibuler	3df6af53cb	fix: 修复lina nginx	2020-06-01 15:54:15 +08:00
BaiJiangJie	fa1f54b30a	Merge pull request #74 from jumpserver/dev_cap ... [Update] i18n添加改密计划en翻译	2020-06-01 15:36:20 +08:00
Bai	6be1ba8e69	[Update] i18n添加改密计划en翻译	2020-06-01 15:35:10 +08:00
ibuler	c38b1cdb8a	fix: 去掉不用的函数	2020-06-01 15:26:24 +08:00
ibuler	743f517fcd	fix: 简单修改	2020-06-01 15:25:05 +08:00
ibuler	22ef377097	fix: 修复不断登录的问题	2020-06-01 15:22:10 +08:00
OrangeM21	d7341c13a1	[fix]修复el-render-table 组件 Bug	2020-06-01 14:46:59 +08:00
ibuler	191ef09d61	fix: 修复导入导出 对齐问题	2020-06-01 14:34:50 +08:00
OrangeM21	7341a955b4	[fix]修复组件bug	2020-06-01 14:27:50 +08:00
ibuler	f24181b22a	doc: 修改readme	2020-06-01 14:09:44 +08:00
ibuler	8de9042a1a	doc: 修改readme	2020-06-01 14:09:27 +08:00
ibuler	040e212006	[Update] 修改readme	2020-06-01 14:08:12 +08:00
ibuler	1ad43e2921	feat: proxyhost移动到环境变量 feat: 添加README	2020-06-01 13:59:31 +08:00
OrangeM21	a85b527f7e	[update]修改默认时间选择器	2020-06-01 13:52:03 +08:00
OrangeM21	df1d615d10	[update]修改默认时间选择器	2020-06-01 13:51:50 +08:00
OrangeM21	9b9a299bdc	Merge remote-tracking branch 'origin/master'	2020-06-01 13:35:24 +08:00
OrangeM21	f555ecf1f2	[update]测试默认时间选择器	2020-06-01 13:34:13 +08:00
OrangeM21	8e659b64c7	[update]测试默认时间选择器	2020-06-01 13:34:06 +08:00
ibuler	1961f76132	feat: 去掉多余的	2020-06-01 12:33:56 +08:00
ibuler	b18c2549fc	feat: 添加未翻译的字符	2020-06-01 11:44:41 +08:00
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