7199 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ibuler	4b4bb455d6	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-09 18:54:27 +08:00
Bai	6bfd5f4c4a	[Update] 修改资产授权规则详情用户页reloadTable	2020-06-09 18:52:08 +08:00
Eric	ce864c4f34	替换位置	2020-06-09 18:41:55 +08:00
ibuler	2f274edd2b	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-09 18:28:25 +08:00
ibuler	ed2c17bd4c	feat: ztree添加高度	2020-06-09 18:27:57 +08:00
Bai	cb29943e8b	[Update] 修改授权规则详情文案	2020-06-09 18:25:21 +08:00
ibuler	de12c20854	feat: 添加翻译	2020-06-09 18:19:30 +08:00
Bai	1a84cb9636	[Update] 修改资产授权规则is_valid字段	2020-06-09 18:17:39 +08:00
Bai	b3c591ab26	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-09 18:12:24 +08:00
Bai	747602e7bf	[Update] 创建/更新授权规则页面添加DateStart字段	2020-06-09 18:12:07 +08:00
OrangeM21	42d841f855	Merge remote-tracking branch 'origin/dev' into dev	2020-06-09 17:44:16 +08:00
OrangeM21	50268991f9	[fix]退出之后清除Cookie	2020-06-09 17:38:12 +08:00
ibuler	6d024f48cb	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-09 17:28:59 +08:00
ibuler	bc400913e2	fix: 解决select2作为component的问题	2020-06-09 17:27:39 +08:00
Bai	7f47e791d0	[Update] 修改资产列表TreeTableDialog资产树背景色	2020-06-09 17:27:07 +08:00
Bai	c462a7ecd6	[Update] 修改翻译	2020-06-09 17:11:36 +08:00
ibuler	220b54788a	feat: webpack 添加websocket代理	2020-06-09 17:07:52 +08:00
ibuler	a8034bb0bf	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-09 16:50:51 +08:00
BaiJiangJie	429e639612	Merge pull request #91 from jumpserver/dev_assetTreeRMenu ... Dev asset tree r menu	2020-06-09 16:49:56 +08:00
ibuler	40e118bb41	feat: 修改base api	2020-06-09 16:48:12 +08:00
Bai	38c0875a31	[Update] 完善AssetList rMenu	2020-06-09 16:46:29 +08:00
Eric	2f92e9284a	gateway name display	2020-06-09 16:34:18 +08:00
ibuler	cd4da8409b	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-09 16:14:22 +08:00
ibuler	2b9d682dd9	feat: 修改用户权限详情	2020-06-09 16:06:04 +08:00
OrangeM21	fb58557d93	Merge remote-tracking branch 'origin/dev' into dev	2020-06-09 16:05:46 +08:00
OrangeM21	abd679b98b	修复Logo显示的问题	2020-06-09 16:01:39 +08:00
Eric	184ee38aa8	Merge branch 'dev' of https://github.com/jumpserver/lina into dev	2020-06-09 16:00:29 +08:00
Eric	60fed3724e	fix user detail rules search keys	2020-06-09 16:00:01 +08:00
xinwen	4f4bc26b81	[Update] 登录复核 i18n	2020-06-09 15:59:34 +08:00
ibuler	058e11167d	feat: 修改用户默认创建为用户	2020-06-09 15:46:57 +08:00
ibuler	fd95b0cd4e	feat: 修改用户详情中的一个bug	2020-06-09 15:43:52 +08:00
Eric_Lee	df006460b6	asset perms search (#90)	2020-06-09 15:38:43 +08:00
ibuler	caf9a64d7e	feat: remote apps添加helpmessages	2020-06-09 15:36:07 +08:00
xinwen	3cd1a9cb0e	[Fix] Xpack-云管中心-同步实例任务列表-单击某个同步实例任务-没有可执行的按钮功能	2020-06-09 15:32:22 +08:00
ibuler	b65dfd1e6a	feat: 修改用户页面路由	2020-06-09 15:27:42 +08:00
ibuler	a8c0c7f014	feat: 修改我的资产布局	2020-06-09 15:20:55 +08:00
ibuler	756a2dbd3b	feat: 修改资产详情中布局的宽度	2020-06-09 15:14:54 +08:00
ibuler	c59383171b	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-09 15:09:57 +08:00
ibuler	f092181b84	feat: 修改网关创建和列表	2020-06-09 15:05:27 +08:00
Bai	baa9f3f7b5	[Update] 移动rMenu从TreeTable到AssetList页面	2020-06-09 14:47:57 +08:00
xinwen	27fc745cf4	[Fix] 作业中心/任务列表/任务详情/执行历史/历史不能进入详情	2020-06-09 14:21:20 +08:00
Eric	509ae8ea6b	remove customSettings and get logo urls from publicSettings	2020-06-09 14:08:15 +08:00
xinwen	cd91ca5caf	[Fix] 作业中心/任务列表/任务详情/任务各版本/不能进入详情	2020-06-09 11:46:47 +08:00
xinwen	e073256471	[Update] X-Pack 收集用户/任务列表 添加执行按钮	2020-06-09 11:46:47 +08:00
BaiJiangJie	bcf3f1415d	Merge pull request #89 from jumpserver/dev_treermenu ... Dev Tree rMenu	2020-06-09 11:04:06 +08:00
Eric	a7edfb52d8	modify api url	2020-06-09 11:01:59 +08:00
Bai	ac09a57684	[Update] Merge branch from dev to dev_treermenu	2020-06-09 11:00:21 +08:00
ibuler	8be168741c	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-09 10:16:32 +08:00
ibuler	bb1ba47856	feat: 修改asset user table	2020-06-09 10:14:42 +08:00
OrangeM21	192944ba8b	[fix]更新云管中心	2020-06-08 20:59:24 +08:00