997 Commits

Author	SHA1	Message	Date
Torkel Ödegaard	fc69d59cae	dashboard folder search fix	2017-06-23 16:00:26 -04:00
Torkel Ödegaard	e854fadb67	Merge branch 'master' into develop	2017-06-23 12:56:59 -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
Torkel Ödegaard	ff4a79df06	minor update	2017-06-23 11:01:55 -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
Torkel Ödegaard	a4910c7aea	merging new-sidenav	2017-06-22 18:11:29 -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
Daniel Lee	f68d2816ab	dashfolders: security for png rendering	2017-06-22 01:23:48 +02:00
Torkel Ödegaard	2257c1f874	dashboard acl work	2017-06-21 19:02:03 -04:00
Torkel Ödegaard	fcc8557dbb	dashboard acl work	2017-06-21 14:11:16 -04:00
Torkel Ödegaard	43ffe826fa	dashboard acl work	2017-06-20 17:18:20 -04:00
Torkel Ödegaard	212a66ae5f	Merge branch 'dashboard_folders' of github.com:grafana/grafana into dashboard_folders	2017-06-19 18:55:34 -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
Torkel Ödegaard	74840178cf	refactoring dashboard folder security checks	2017-06-19 15:22:42 -04:00
Torkel Ödegaard	f7194878fe	dashboard guardian refactoring starting to work	2017-06-19 13:47:44 -04:00
Torkel Ödegaard	d6341162cb	refactoring dashboad folder acl checks	2017-06-19 11:54:37 -04:00
Torkel Ödegaard	b494fd7689	dashboard folders acl work	2017-06-19 11:03:54 -04:00
Torkel Ödegaard	cbbbccf12a	refactoring dashoard folder guardian	2017-06-17 18:24:38 -04:00
Daniel Lee	0eb297822c	httpserver: fixes #8641 ... Changes to the http_server class meant that the TLS settings were not getting applied anymore. This fixes so that the minimum TLS version is 1.2 again.	2017-06-17 23:10:12 +02:00
Torkel Ödegaard	3fe031d25d	refactoring: Dashboard guardian	2017-06-16 21:25:24 -04:00
Daniel Lee	5cf40cbd12	WIP: move guardian logic for search into the sql query	2017-06-17 02:34:05 +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
Daniel Lee	dd02bf7c9b	WIP: adds API check to stop folders being included in folders	2017-06-16 02:45:47 +02:00
Daniel Lee	699f9095e2	WIP: remove permissions when deleting global user	2017-06-14 23:45:30 +02:00
Daniel Lee	92717ccafb	WIP: permission checking for dash version api methods	2017-06-14 00:28:34 +02:00
Daniel Lee	a861b1b9ba	WIP: check permissions for delete/post dashboard	2017-06-12 23:05:32 +02:00
Torkel Ödegaard	5061b3c691	ux: nav experiments	2017-06-12 21:11:22 +02:00
Daniel Lee	3913f16550	WIP: add permission check for GetDashboard	2017-06-12 16:48:51 +02:00
Daniel Lee	9eccb4e79f	WIP: API - add dash permission	2017-06-12 15:49:09 +02:00
Daniel Lee	2097ed0bb8	WIP: Permission Type as string in permission query	2017-06-12 15:49:09 +02:00
Daniel Lee	5c89c4b2bd	WIP: dashlist in template for new folder	2017-06-12 15:49:09 +02:00
Daniel Lee	c602afb9c6	WIP: dashboard search by folder + toggle for list or tree mode	2017-06-12 15:49:09 +02:00
Daniel Lee	82afe8228f	WIP: add parentid to getdashboard query result	2017-06-12 15:49:09 +02:00
Daniel Lee	68b9342de3	WIP: dashboard search by type (folder or dash)	2017-06-12 15:49:09 +02:00
Daniel Lee	fa18b0053d	WIP: delete permission in API	2017-06-12 15:49:09 +02:00
Daniel Lee	53d11d50fc	WIP: remove browse mode for dashboard search ... Dashboard folders included in all searches. If a dashboard matches a search and has a parent folder then the parent folder is appended to the search result. A hierarchy is then returned in the result with child dashboards under their parent folders.	2017-06-12 15:49:09 +02:00
Daniel Lee	f1e1da39e3	WIP: get Dashboard Permissions ... The guardian class checks if the user is allowed to get the permissions for a dashboard.	2017-06-12 15:49:09 +02:00
Daniel Lee	552935031b	WIP: API methods for add/remove members to user group	2017-06-12 15:49:09 +02:00
Daniel Lee	0a1df0905e	WIP: add update user group command	2017-06-12 15:49:09 +02:00