10963 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Denis Doria	e8d01218d8	Fix label showing up when Axes are configured to not be displayed (#8697) ... This should close the issue #8695	2017-06-25 14:23:37 +02:00
Denis Doria	5aac2d2078	Include user Id on the lookup api (#8698) ... Implements feature request #8682	2017-06-25 14:23:03 +02:00
Daniel Lee	ebcbcdc27a	dashfolders: inherited permissions for dashboards ... Allow duplicate permissions if the original is an inherited permission from a parent folder. If a dashboard has permissions but the parent folder does not, return the default permissions for the editor and view role combined with the permissions for the child dashboard.	2017-06-24 03:50:22 +02:00
Daniel Lee	86a7266f5f	dashfolders: handle permission changes when saving/moving dashboards	2017-06-23 23:31:58 +02:00
Torkel Ödegaard	3066280216	added code from #8504, and #8021	2017-06-23 17:13:58 -04:00
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
Torkel Ödegaard	60da730c95	mysql: fix for TIME columns, fixes #8534	2017-06-23 12:55:40 -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
Torkel Ödegaard	be29357d22	fix: added missing url route for annotation state history delete, fixes #8660	2017-06-23 11:48:58 -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	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