6986 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Bai	4c00790a22	[Update] 修改授权规则创建初始化开始日期值	2020-06-12 10:55:18 +08:00
xinwen	71e27fe8a0	[Fix] 作业中心/任务详情/ 最后运行成功/失败 主机	2020-06-12 10:54:51 +08:00
ibuler	d6ce8a6ff6	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-11 20:49:54 +08:00
ibuler	9a3e9b16b2	fix: 修改user group users tranform option	2020-06-11 20:49:28 +08:00
Eric	f4b89f3ce4	add moment.js	2020-06-11 20:40:09 +08:00
xinwen	d7e4cb4200	[Update] 应用管理/远程应用 i18n	2020-06-11 20:30:42 +08:00
xinwen	8391d10aec	[Update] src/views/applications/RemoteApp/const.js	2020-06-11 20:30:42 +08:00
Bai	316480e02d	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-11 20:21:11 +08:00
Bai	361eb5e0ac	[Update] 修改云管中心创建表单页面	2020-06-11 20:20:57 +08:00
Eric	21598aa464	router link	2020-06-11 20:07:11 +08:00
Bai	7a579df138	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-11 19:46:23 +08:00
Bai	33fadfbc88	[Update] 修改用户详情字段顺序	2020-06-11 19:45:46 +08:00
OrangeM21	89ffb38ae4	Merge remote-tracking branch 'origin/dev' into dev	2020-06-11 19:32:41 +08:00
OrangeM21	1400a0f8e3	[fix]资产详情增加添加资产的组件	2020-06-11 19:31:28 +08:00
BaiJiangJie	70eee87d1c	Merge pull request #96 from jumpserver/dev_bulk ... Dev bulk	2020-06-11 19:27:53 +08:00
Bai	9b24bbb114	[Update] Merge to dev	2020-06-11 19:27:24 +08:00
Eric	36c7c50fbf	remove msg	2020-06-11 19:24:59 +08:00
Bai	f5696ac07a	[Update] 修改翻译	2020-06-11 19:24:58 +08:00
Bai	29e804e5e6	[Update] 过滤批量更新表单提交字段	2020-06-11 19:17:16 +08:00
ibuler	19f9bde148	merge: with dev	2020-06-11 19:02:25 +08:00
ibuler	1f4e24b681	feat: merge	2020-06-11 18:51:15 +08:00
ibuler	9b5c3884e0	feat: 修改翻译	2020-06-11 18:49:59 +08:00
BaiJiangJie	b5a8854611	Merge pull request #95 from jumpserver/dev_bulkUpdate ... Dev bulk update	2020-06-11 18:49:26 +08:00
Bai	b3b9ff8c82	[Update] 修改批量更新表单样式	2020-06-11 18:44:25 +08:00
Bai	0054abe706	[Update] 资产列表更新bulkUpdate	2020-06-11 18:32:36 +08:00
ibuler	45f21c7abe	fix: 修改翻译	2020-06-11 18:30:22 +08:00
OrangeM21	13953df74e	Merge remote-tracking branch 'origin/dev' into dev	2020-06-11 18:29:53 +08:00
OrangeM21	c4dc28314b	[fix]给Tag增加默认值	2020-06-11 18:29:33 +08:00
Bai	80f4149de1	[Update] 批量更新表单添加fields选择	2020-06-11 18:27:23 +08:00
xinwen	083802e016	[Fix] 会话管理/风险等级 由数字改为文字描述	2020-06-11 17:59:00 +08:00
xinwen	f66ed52985	[Fix] 会话管理/命令记录 去掉上传按钮	2020-06-11 17:59:00 +08:00
ibuler	a20e1c1618	fix: 修复添加org后需要刷新的问题，修改通用创建更新form	2020-06-11 17:56:13 +08:00
ibuler	42104f6047	fix: 修改profile，修复创建更新remote apps	2020-06-11 16:48:28 +08:00
Eric_Lee	b2bd7119c6	Merge pull request #94 from jumpserver/uploadfile ... preview img file	2020-06-11 15:48:10 +08:00
Eric	fd8140bf29	preview img file	2020-06-11 15:46:45 +08:00
OrangeM21	839b954aae	[fix]vault	2020-06-11 15:32:10 +08:00
Eric	56fc8f20fb	modify favicon url	2020-06-11 13:45:14 +08:00
xinwen	fa0e0988cd	[Fix] 点击转到报错，可以转到会话详情，但会话详情页面报错404	2020-06-11 13:41:09 +08:00
ibuler	567af42bbf	fix: 修复detail formatter的bug	2020-06-11 13:36:33 +08:00
BaiJiangJie	2e4be76697	Merge pull request #93 from jumpserver/dev_bulkUpdate ... Dev bulk update	2020-06-11 12:25:26 +08:00
Bai	fe939f3baa	[Update] 添加批量更新	2020-06-11 12:23:59 +08:00
ibuler	14aacdd55b	feat: 修改detail formatter	2020-06-11 11:11:06 +08:00
ibuler	840c0ed8b8	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-11 10:17:44 +08:00
OrangeM21	af2efd768b	[fix]IE兼容性问题	2020-06-11 00:41:29 +08:00
ibuler	6b109e3e2c	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-10 20:55:49 +08:00
OrangeM21	97b9138f94	Revert "[fix]IE兼容性问题" ... This reverts commit 13de2f6b	2020-06-10 20:46:29 +08:00
ibuler	d9187d9b0a	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-10 20:35:47 +08:00
ibuler	abe8b0f673	feat: 修改request拦截	2020-06-10 20:32:58 +08:00
OrangeM21	e70fceacd0	Merge remote-tracking branch 'origin/dev' into dev	2020-06-10 20:32:17 +08:00
OrangeM21	13de2f6bc8	[fix]IE兼容性问题	2020-06-10 20:31:30 +08:00