10948 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Torkel Ödegaard	86a73c359b	fix: data source selector did not show, fixes #8692	2017-06-23 11:32:17 -04:00
Torkel Ödegaard	ff4a79df06	minor update	2017-06-23 11:01:55 -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
Torkel Ödegaard	12270022e3	added sidemeu stuff	2017-06-22 18:41:39 -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
Ben Tranter	a3d22ae9c7	Document logic behind basic diff	2017-06-22 18:23:31 -04:00
Torkel Ödegaard	a4910c7aea	merging new-sidenav	2017-06-22 18:11:29 -04:00
Ben Tranter	b54b43a42e	Add tests for diff formatters	2017-06-22 18:08:37 -04:00
Torkel Ödegaard	aa634402d9	dashboard acl fixes	2017-06-22 17:43:55 -04:00
Torkel Ödegaard	545b02139d	Merge branch 'dashboard_folders' of github.com:grafana/grafana into dashboard_folders	2017-06-22 17:11:39 -04:00
Torkel Ödegaard	9c6c8c0f3f	acl fixes	2017-06-22 17:10:43 -04:00
Daniel Lee	1d43bfbf3f	dashfolders: new admin permission needed to view/change acl	2017-06-22 23:01:04 +02:00
Torkel Ödegaard	f6b52cd6d7	Merge branch 'dashboard_folders' of github.com:grafana/grafana into dashboard_folders	2017-06-22 15:16:57 -04:00
Torkel Ödegaard	a82b25eb79	acl: more acl work	2017-06-22 15:16:41 -04:00
Daniel Lee	46c5625b59	dashfolders: filter search based on child dash permissions	2017-06-22 20:10:49 +02:00
Daniel Lee	446104d120	dashfolders: allows phantomjs rendering for alerting ... Makes the alerting user an admin when rendering a png for emails	2017-06-22 02:43:33 +02:00
Daniel Lee	691ff32ae9	dashfolders: allow overflow-y for modals	2017-06-22 02:07:49 +02:00
Daniel Lee	f68d2816ab	dashfolders: security for png rendering	2017-06-22 01:23:48 +02:00
Torkel Ödegaard	659a59107e	dashboard acl stuff	2017-06-21 19:23:24 -04: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
Torkel Ödegaard	48305b5789	dashboard acl	2017-06-21 14:19:08 -04:00
Torkel Ödegaard	fcc8557dbb	dashboard acl work	2017-06-21 14:11:16 -04:00
Haidara Mohamed El Mouctar	bc6a57ce32	[Docs] Add documentation for max_idle_conn and max_open_conn (#8675)	2017-06-21 10:41:56 -04: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	2479e51a6b	mysql: Null value should not be considered as previous value ... fixes #8655	2017-06-20 02:02:05 +02:00
Torkel Ödegaard	2a93bed453	ux: aligned tabbed view body with header title	2017-06-19 19:22:44 -04:00
Daniel Lee	cb8b5c0d42	WIP: adding roles - not finished	2017-06-20 01:08:04 +02:00
Torkel Ödegaard	212a66ae5f	Merge branch 'dashboard_folders' of github.com:grafana/grafana into dashboard_folders	2017-06-19 18:55:34 -04:00
Torkel Ödegaard	93bc588dae	refactoring: moving dashboards acl migrations to its own folder	2017-06-19 18:48:15 -04:00
Daniel Lee	812112f2f6	WIP: fix acl route	2017-06-20 00:34:25 +02:00
Torkel Ödegaard	e290015887	refactoring: renaming	2017-06-19 18:19:58 -04:00
Torkel Ödegaard	aaf2a897b0	folders: changed api urls for dashboard acls	2017-06-19 18:11:30 -04:00
Torkel Ödegaard	c4a1803060	refactoring more renaming	2017-06-19 17:30:54 -04: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
Denis Doria	eaba985f25	Fix issue with kilovolt-ampere reactive (kvar) #8596 (#8650) ... This changes the css to handle overflow of the string on the input fields. If an overflow happends an ellipsis is used.	2017-06-19 16:23:12 -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	04da97bffb	dashboard_folders refactoring	2017-06-19 15:37:22 -04:00