989 Commits

Author	SHA1	Message	Date
Trent White	1cbd88fc14	dashboard settings icons	2017-12-13 18:17:56 -05:00
Marcus Efraimsson	a583f92d16	dashfolders: bulk move dashboards synchronously ... #10181 Also added better error handling when moving dashboards to other folders	2017-12-13 18:21:49 +01:00
Torkel Ödegaard	2765c2ecc7	Merge branch 'develop-settings-links' into develop	2017-12-13 18:08:12 +01:00
Torkel Ödegaard	7f0440fded	minor tweaks	2017-12-13 18:00:16 +01:00
Alexander Zobnin	a48ba7b19e	Dashboard grid fixes (#10194) ... * grid: fix layout saving after panel move, #10185 * don't allow to drag fullscreen panels, #10171	2017-12-13 17:53:57 +01:00
Torkel Ödegaard	d417a625d5	Merge branch 'develop' of github.com:grafana/grafana into develop	2017-12-13 15:55:16 +01:00
Torkel Ödegaard	313735bd75	search: worked on search results	2017-12-13 15:51:59 +01:00
Patrick O'Carroll	daf32c579d	changed width to input fields (#10184)	2017-12-13 12:42:50 +01:00
Torkel Ödegaard	60e2ba111f	plugins: fixed plugin edit page and plugin page	2017-12-13 11:12:35 +01:00
Daniel Lee	c98e15903e	dashfolder: settings page for folder ... with rename and delete. Fixes #10120	2017-12-13 10:54:08 +01:00
Torkel Ödegaard	05cc1f85c3	Merge branch 'refactor-user-group-to-team' of https://github.com/alexanderzobnin/grafana into user-group-to-team	2017-12-12 17:07:00 +01:00
Torkel Ödegaard	cfd755eb93	updated new dashboard folder	2017-12-12 15:19:59 +01:00
Torkel Ödegaard	d379b501aa	ux: search look update	2017-12-12 13:55:32 +01:00
Torkel Ödegaard	e98f573732	build: fixed broken test	2017-12-12 12:31:41 +01:00
Torkel Ödegaard	bbd0b98be9	Merge branch 'develop-settings' into develop	2017-12-12 12:03:10 +01:00
Torkel Ödegaard	7b0bbefb96	ux: minor updates to dashboard settings	2017-12-12 12:02:44 +01:00
Torkel Ödegaard	0a8bd5d289	ux: dashboard settings updated	2017-12-12 11:49:01 +01:00
Patrick O'Carroll	6ae94dda87	redesign dashlinks	2017-12-12 11:21:32 +01:00
Torkel Ödegaard	79d9b64f82	fix: fixed issue with optimized build grid directive missing ngInject comment, fixes #10161	2017-12-12 11:00:16 +01:00
Torkel Ödegaard	cc046f03aa	ux: dashboard settings progress	2017-12-11 17:19:17 +01:00
Torkel Ödegaard	97bd00c520	ux: dashboard settings work progress	2017-12-11 16:46:10 +01:00
Torkel Ödegaard	008b9bb3e9	ux: dashboard settings work progress	2017-12-11 16:28:57 +01:00
Torkel Ödegaard	c4b759fe6d	ux: dashboard settings progress	2017-12-11 15:04:48 +01:00
Torkel Ödegaard	7f597283e8	ux: dashboard settings progress	2017-12-11 13:47:04 +01:00
Torkel Ödegaard	61dbcfd35b	ux: dashboard settings progress	2017-12-11 13:29:23 +01:00
Torkel Ödegaard	05ec7541c8	ux: dashboard settings progress	2017-12-11 13:04:06 +01:00
Torkel Ödegaard	8354c64ff5	Merge branch 'develop' into develop-settings	2017-12-11 12:15:59 +01:00
Torkel Ödegaard	09cc60ffe4	ux: dashboard settings progress	2017-12-11 12:13:45 +01:00
Torkel Ödegaard	2ce4a8e4c5	fix: fixed build failure	2017-12-11 10:52:38 +01:00
Torkel Ödegaard	511fa7dec1	ux: dashboard settings progress	2017-12-10 12:41:11 +01:00
Torkel Ödegaard	00c723f04a	ux: minor changes	2017-12-10 12:21:04 +01:00
Torkel Ödegaard	e1440dcc44	ux: navbar progress	2017-12-09 22:45:33 +01:00
Torkel Ödegaard	1e5983b46c	Merge branch 'develop' into develop-settings	2017-12-09 21:50:26 +01:00
Torkel Ödegaard	55609382f1	fix: fixed panel size rerendering issues	2017-12-09 13:53:03 +01:00
Torkel Ödegaard	fbe9f759ad	ux: work on dashboard settings views	2017-12-08 18:15:24 +01:00
Marcus Efraimsson	47014ddb65	dashfolders: Do not allow loading a folder as a dashboard	2017-12-08 17:50:37 +01:00
Marcus Efraimsson	1985027549	dashfolders: Folder picker should set correct default values. Fixes #10135	2017-12-08 17:46:52 +01:00
Alexander Zobnin	e4675ca5c1	refactor: user groups to teams, replace rest mentions	2017-12-08 19:01:10 +03:00
Alexander Zobnin	d8612380e9	refactor: rename User Groups to Teams	2017-12-08 18:25:45 +03:00
Torkel Ödegaard	7a2e886e70	Merge branch 'develop' into develop-settings	2017-12-08 16:02:42 +01:00
Torkel Ödegaard	1b6be031e5	ux: dashboard settings progress	2017-12-08 15:53:26 +01:00
Torkel Ödegaard	db663c380b	new timepicker is working	2017-12-08 14:38:33 +01:00
Torkel Ödegaard	9369a87e93	Merge branch 'develop' into develop-settings	2017-12-08 14:32:15 +01:00
Marcus Efraimsson	b03b360414	dashfolders: Create nav model for folder page client side #10083	2017-12-08 14:08:16 +01:00
Torkel Ödegaard	63b717f607	ux: minor change to new folder page	2017-12-08 13:54:11 +01:00
Torkel Ödegaard	77b537f45f	ux: added react scrollbar component and added it to add panel panel	2017-12-08 13:30:16 +01:00
Torkel Ödegaard	2bc23d2063	tech: updated ngreact and with custom PR applied	2017-12-08 12:26:19 +01:00
Torkel Ödegaard	e03abde778	refactoring: #10130	2017-12-08 12:17:09 +01:00
Torkel Ödegaard	974d4d9739	Revert "Don't animate panels on initial render (#10130)" ... This reverts commit e0c173c5af.	2017-12-08 11:53:51 +01:00
Alexander Zobnin	e0c173c5af	Don't animate panels on initial render (#10130) ... * grid: dont animate panels on initial render * grid: dont animate panels on initial render	2017-12-08 11:49:14 +01:00