12433 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Torkel Ödegaard	ccbd18006e	ux: org user management changes	2017-12-13 13:16:44 +01:00
Torkel Ödegaard	cacbcb9c99	ux: added search box to ds list page, closes #10106	2017-12-13 11:29:29 +01:00
Torkel Ödegaard	22aa1f7e42	ux: change members to users	2017-12-13 11:21:33 +01:00
Torkel Ödegaard	60e2ba111f	plugins: fixed plugin edit page and plugin page	2017-12-13 11:12:35 +01:00
Marcus Efraimsson	c6a02bec81	dashfolders: Minor css fixes for bulk edit	2017-12-13 11:08:28 +01:00
Marcus Efraimsson	a9ba7b912f	dashfolders: Minor css fixes for bulk edit	2017-12-13 10:59:29 +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	2465fcbd6b	fix: FolderId and IsFolder when saving dashboard	2017-12-13 10:00:54 +01:00
Torkel Ödegaard	d3858d8847	ux: fixed inactive view mode and removed animation	2017-12-13 09:49:24 +01:00
Alexander Zobnin	d85405d5b5	ux: move add member into its own page (#10167)	2017-12-12 20:15:26 +01:00
Torkel Ödegaard	67f1435dc7	minor fix for #10136	2017-12-12 17:18:25 +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
Alexander Zobnin	10fbfcb1d3	Fix graph legend scroll (#10169) ... * graph panel: fix legend scroll * graph panel: enable scroll for table legend * graph panel: fix legend right side toggle	2017-12-12 17:02:19 +01:00
Alexander Zobnin	8aaaee5e16	fix colorpicker colors order (width issue) (#10170)	2017-12-12 17:00:56 +01:00
Torkel Ödegaard	89db9cc976	fix: fixed dashboard api tests	2017-12-12 16:15:24 +01:00
Torkel Ödegaard	de91d68402	fix: don't detect graphite version before it's saved	2017-12-12 15:28:41 +01:00
Torkel Ödegaard	cfd755eb93	updated new dashboard folder	2017-12-12 15:19:59 +01:00
Torkel Ödegaard	271c597c9b	ux: style tweaks	2017-12-12 15:13:47 +01:00
Torkel Ödegaard	d379b501aa	ux: search look update	2017-12-12 13:55:32 +01:00
Torkel Ödegaard	df25c9f0fa	tech: updated version for react-grid item	2017-12-12 13:27:56 +01:00
Torkel Ödegaard	8a61e0967e	Merge branch 'master' into develop	2017-12-12 13:22:13 +01:00
Torkel Ödegaard	a00af85f36	build: fixed unit test failure	2017-12-12 13:21:50 +01:00
Torkel Ödegaard	cafed8ce8f	Merge branch 'master' into develop	2017-12-12 13:19:07 +01:00
bergquist	ff1b71bc20	allow overriding dashboards from api	2017-12-12 13:18:00 +01:00
Torkel Ödegaard	871b98c06b	graphite: minor fix for PR #10142 the query was being sent for every segmen t you selected before you completed the metric path	2017-12-12 12:56:40 +01:00
Torkel Ödegaard	bb52f3670e	Merge branch 'parseTarget' of https://github.com/DanCech/grafana into DanCech-parseTarget	2017-12-12 12:38:58 +01:00
Torkel Ödegaard	e98f573732	build: fixed broken test	2017-12-12 12:31:41 +01:00
Torkel Ödegaard	35c8cdf3a5	refactor: minor change to panel json fix PR #10156	2017-12-12 12:10:19 +01:00
Alexander Zobnin	86204abbfe	Move panel JSON editor to modal dialog (#10156) ... * panel: fix JSON edit, #10149 * panel: show JSON editor in modal, #10149	2017-12-12 12:04:08 +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	515faa9ec5	new dashboard and folder in search (#10152) ... * new dashboard and folder in search * code formatting fixes	2017-12-12 11:26:15 +01:00
bergquist	c68e7c7283	avatar: avoid concurrent map writes	2017-12-12 11:25:47 +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
Carl Bergquist	ea2f65b4c3	Merge pull request #10110 from bwhaley/master ... Fixes bug in cloudwatch regarding credentials	2017-12-12 10:16:53 +01:00
Alexander Zobnin	26281dd9d8	refactor: format files by gofmt	2017-12-11 19:46:05 +03: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
Daniel Lee	a37f1b77f1	dashfolders: new dashboard with folder selected ... Fixes #10133	2017-12-11 16:37:40 +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	a682475152	fix: fixed failing test	2017-12-11 13:09:25 +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	795d9c0362	ux: fixed navbar and sidemenu z-index issue and improved responsive rules	2017-12-11 11:42:13 +01:00
Torkel Ödegaard	2ce4a8e4c5	fix: fixed build failure	2017-12-11 10:52:38 +01:00