6986 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Eric	252ff3d9c0	修改storage	2020-04-26 11:31:44 +08:00
jym503558564	8a629ce7f3	Merge branch 'master' into jym_dev	2020-04-26 11:04:08 +08:00
Eric	4ac43ca708	[Update] 修改 action formatter	2020-04-26 11:00:25 +08:00
ibuler	9a29bc19ce	[Update] 修改action formator	2020-04-26 10:45:48 +08:00
ibuler	7b6a8878fb	[Update] 修改action formattor	2020-04-26 10:31:28 +08:00
ibuler	4accd55600	Merge remote-tracking branch 'origin/card'	2020-04-26 10:22:04 +08:00
ibuler	606cddbc40	Merge branch 'master' of github.com:jumpserver/lina	2020-04-26 10:16:04 +08:00
ibuler	b55cc3ce9f	[Update] stash card	2020-04-26 08:59:17 +08:00
Eric_Lee	d847c1ca7e	Dev eric (#32) ... * fix more action * add customActionsFormatter	2020-04-24 17:41:59 +08:00
ibuler	ec3bd29153	[Update] Table换个风格	2020-04-24 10:52:30 +08:00
ibuler	56f5c18ffc	[Update] 修改分页	2020-04-24 10:13:13 +08:00
ibuler	053ac8e12f	[Update] 修改分页	2020-04-24 10:07:54 +08:00
jym503558564	354fbd9fbe	[Update] 资产授权列表页添加可搜索字段	2020-04-24 09:52:53 +08:00
ibuler	861160471b	Merge branch 'master' of github.com:jumpserver/lina	2020-04-23 21:06:07 +08:00
ibuler	2ecf33b092	[Bugfix] 修复拼写错误	2020-04-23 21:05:55 +08:00
Eric_Lee	58e987bbbb	Dev eric (#31) ... * Storage page view	2020-04-23 21:05:20 +08:00
ibuler	f96f200a13	[Update] 修改check boolean	2020-04-23 21:00:09 +08:00
ibuler	a6b3410ff6	[Update] Remove debug msg	2020-04-23 20:53:34 +08:00
ibuler	6ed5123d21	[Update] remove click	2020-04-23 20:50:09 +08:00
ibuler	2aefcf6ee5	[Update] Merge with master	2020-04-23 20:48:31 +08:00
ibuler	c7be48a62e	[Update] 优化actions	2020-04-23 20:46:34 +08:00
ibuler	8442218e04	[Update] 优化select2	2020-04-23 19:12:09 +08:00
Orange	336242dd07	Merge pull request #30 from jumpserver/orange_dev ... [hotfix]修改搜索组件	2020-04-23 17:19:00 +08:00
OrangeM21	c8d6afc7c2	[hotfix]修改搜索组件	2020-04-23 17:17:32 +08:00
Orange	875213968f	Merge pull request #29 from jumpserver/orange_dev ... [update]修改搜索组件	2020-04-23 16:43:19 +08:00
OrangeM21	ffa49b6acf	[update]修改搜索组件	2020-04-23 16:24:57 +08:00
OrangeM21	1159201b30	[update]修改搜索组件	2020-04-23 16:23:39 +08:00
八千流	cabddf577a	Merge pull request #28 from jumpserver/jym_dev ... [Update] 修改一些详情组件	2020-04-23 16:16:07 +08:00
jym503558564	2244d7fede	[Update] 修改一些详情组件	2020-04-23 16:10:26 +08:00
八千流	3d8f315a9b	Merge pull request #27 from jumpserver/jym_dev ... [Update] 资产授权增加资产树	2020-04-23 14:23:32 +08:00
jym503558564	1d21c0f3ea	[Update] 资产授权增加资产树	2020-04-23 14:18:34 +08:00
Eric_Lee	42a0367443	Dev eric (#26) ... * terminal detail page * Storage page view	2020-04-22 20:45:54 +08:00
ibuler	30e455f90a	Merge branch 'master' of github.com:jumpserver/lina	2020-04-22 17:44:03 +08:00
ibuler	7975c0d098	[Update] 重命名tab page	2020-04-22 17:43:30 +08:00
八千流	7c3351c81e	Merge pull request #25 from jumpserver/jym_dev ... Jym dev	2020-04-22 14:54:28 +08:00
jym503558564	d010558b3f	Merge branch 'master' into jym_dev	2020-04-22 14:51:19 +08:00
jym503558564	f33c8d797b	[Update] 增加ActiveCard	2020-04-22 14:49:45 +08:00
ibuler	cefa54c9db	[Update] 修改select, 逻辑单一	2020-04-22 13:35:22 +08:00
Orange	1c28e885cb	Merge pull request #24 from jumpserver/orange_dev ... [update]修改AutoDataForm组件以兼容Tree	2020-04-22 12:01:05 +08:00
jym503558564	37fb3bbee2	Merge branch 'master' into jym_dev	2020-04-22 10:00:20 +08:00
OrangeM21	24248b3430	[update]修改AutoDataForm组件以兼容Tree	2020-04-22 02:12:09 +08:00
ibuler	a67e06d764	[Update] 修改relation组件	2020-04-21 21:03:45 +08:00
jym503558564	5f4f959fb0	[Update] 修改权限管理详情组件和任务详情组件	2020-04-21 20:10:29 +08:00
OrangeM21	efd74f2c36	[update]添加命令过滤页面	2020-04-21 20:09:39 +08:00
ibuler	35e006b594	Merge branch 'master' of github.com:jumpserver/lina	2020-04-21 15:38:18 +08:00
ibuler	f5aab354d0	[Update] 修改菜单	2020-04-21 15:36:48 +08:00
OrangeM21	a46cb2757e	Merge branch 'master' of https://github.com/jumpserver/lina	2020-04-21 15:11:18 +08:00
ibuler	818a8ba6e4	[Update] 添加tab click	2020-04-21 15:03:20 +08:00
ibuler	b4aac49eb1	[Update] 修改generic detail	2020-04-21 14:36:49 +08:00
ibuler	668ac84e8a	[Update] 修改详情页	2020-04-21 13:29:27 +08:00