3795 Commits

Author	SHA1	Message	Date
Torkel Ödegaard	1833c65559	Merge branch 'develop' of github.com:grafana/grafana into develop	2017-06-23 16:07:16 -04:00
Torkel Ödegaard	fc69d59cae	dashboard folder search fix	2017-06-23 16:00:26 -04:00
Daniel Lee	01ac3a49bd	dashfolders: fix user group picker + cleanup	2017-06-23 20:56:02 +02:00
Torkel Ödegaard	456225365f	Merge branch 'develop' of github.com:grafana/grafana into develop	2017-06-23 12:59:14 -04:00
Torkel Ödegaard	e854fadb67	Merge branch 'master' into develop	2017-06-23 12:56:59 -04:00
Daniel Lee	c6965ce6f4	dashfolders: rename refactor	2017-06-23 18:00:49 +02:00
Torkel Ödegaard	73fcc919cd	change: made dashboard save message optional	2017-06-23 11:49:32 -04:00
Daniel Lee	97ff245ad0	dashfolders: validation for duplicates in acl modal	2017-06-23 17:45:55 +02:00
Torkel Ödegaard	86a73c359b	fix: data source selector did not show, fixes #8692	2017-06-23 11:32:17 -04:00
Torkel Ödegaard	b7255723ea	ux: style tweaks, trying out non italic headers	2017-06-23 09:18:39 -04:00
Torkel Ödegaard	876bb08b05	Merge branch 'develop' of github.com:grafana/grafana into develop	2017-06-22 19:05:49 -04:00
Torkel Ödegaard	5360303ad4	ux: nav changes	2017-06-22 19:05:33 -04:00
Daniel Lee	6d86afd472	dashfolders: use canadmin permission in settings menu	2017-06-23 00:36:17 +02:00
Daniel Lee	82cfa29c00	dashfolders: tests for permission modal	2017-06-23 00:36:08 +02:00
Torkel Ödegaard	a4910c7aea	merging new-sidenav	2017-06-22 18:11:29 -04:00
Torkel Ödegaard	9c6c8c0f3f	acl fixes	2017-06-22 17:10:43 -04:00
Torkel Ödegaard	a82b25eb79	acl: more acl work	2017-06-22 15:16:41 -04:00
Daniel Lee	691ff32ae9	dashfolders: allow overflow-y for modals	2017-06-22 02:07:49 +02:00
Torkel Ödegaard	2257c1f874	dashboard acl work	2017-06-21 19:02:03 -04:00
Torkel Ödegaard	aab6c98e45	Merge branch 'dashboard-acl' into dashboard_folders	2017-06-21 17:57:57 -04:00
Torkel Ödegaard	a37c441193	dashboard acl	2017-06-21 17:57:04 -04:00
Torkel Ödegaard	945302ba52	working on dashbord acl stuff	2017-06-21 17:14:06 -04:00
Daniel Lee	1e064f6c19	WIP: first draft of permissionlist panel ... for folder home page	2017-06-21 22:28:10 +02:00
Daniel Lee	38142b371f	WIP: fix js tests for acl	2017-06-21 01:19:30 +02:00
Daniel Lee	ca1f429831	WIP: fix folder-picker for dashlist	2017-06-21 01:07:14 +02:00
Torkel Ödegaard	43ffe826fa	dashboard acl work	2017-06-20 17:18:20 -04:00
Torkel Ödegaard	408c37170f	refactoring: dashboard folders	2017-06-20 14:45:00 -04:00
Torkel Ödegaard	3edd209736	dashboard acl modal	2017-06-20 12:36:07 -04:00
Daniel Lee	cb8b5c0d42	WIP: adding roles - not finished	2017-06-20 01:08:04 +02:00
Torkel Ödegaard	e0b9ba7554	refactoring renaming dashboard folder operations	2017-06-19 17:15:25 -04:00
Torkel Ödegaard	34cf305d2c	Merge branch 'master' into dashboard_folders	2017-06-19 16:40:30 -04:00
Torkel Ödegaard	77136d7a70	Merge branch 'master' of github.com:grafana/grafana	2017-06-19 16:02:31 -04:00
Torkel Ödegaard	8440d2d0a2	fix: fixed search issues with in active mode and keyboard nav	2017-06-19 16:02:16 -04:00
Torkel Ödegaard	f7194878fe	dashboard guardian refactoring starting to work	2017-06-19 13:47:44 -04:00
Denis Doria	41d300f69d	Fix timeInterval for mysql datasource (#8651) ... * Fix timeInterval for mysql datasource This changes the > to >= and the < to <=, so the intervals are inclusive. This should fix the #8635 * Fix validation	2017-06-19 08:58:22 -04:00
Alexander Zobnin	9a7e460865	fix heatmap count values bug introduced by #8632	2017-06-18 21:47:08 +03:00
Alexander Zobnin	8626bdfed8	Merge remote-tracking branch 'upstream/master'	2017-06-18 20:59:05 +03:00
Alexander Zobnin	1f4140057b	heatmap-tooltip: normalize histogram Y axis	2017-06-18 20:58:13 +03:00
Daniel Lee	d1e1c4be93	WIP: refactor user group modal	2017-06-18 00:16:33 +02:00
Salman Jalali	49fdbb3843	Update kbn.js	2017-06-17 06:08:10 +02:00
Torkel Ödegaard	d9dca72ee4	dashboard_folders: refactoring picker and folder selection in dashboard settings & save as menu	2017-06-16 16:57:37 -04:00
Torkel Ödegaard	0ad4a0faa9	Merge branch 'master' into dashboard_folders	2017-06-16 13:08:45 -04:00
Torkel Ödegaard	724368d0cd	fix: data source dropdown select	2017-06-16 11:43:37 -04:00
Torkel Ödegaard	25f88e9b3a	Merge branch 'master' of github.com:grafana/grafana	2017-06-16 10:47:53 -04:00
Torkel Ödegaard	056c57d551	ux: temporary remove search	2017-06-16 10:47:17 -04:00
Brandon Arp	5d63ad21c1	allow heatmap parsing of scaled datapoints (#8632)	2017-06-16 10:45:52 -04:00
Torkel Ödegaard	a49e82e447	ux: revert dashboard search nav change, this is a tempoary change until we redesign the sidenav	2017-06-16 09:47:21 -04:00
Torkel Ödegaard	7a39578f33	use gf-form-dropdown in user picker	2017-06-15 16:38:00 -04:00
Torkel Ödegaard	e63fa9c83c	Merge branch 'master' into dashboard_folders	2017-06-15 16:23:10 -04:00
Torkel Ödegaard	840099bec0	refactor: metric segment remake	2017-06-15 15:56:24 -04:00