15 Commits

Author	SHA1	Message	Date
Daniel Lee	f1b1dbc6dd	dashboard: fix test after merge conflict	2017-12-14 09:34:00 +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
Torkel Ödegaard	89db9cc976	fix: fixed dashboard api tests	2017-12-12 16:15:24 +01:00
Alexander Zobnin	d8612380e9	refactor: rename User Groups to Teams	2017-12-08 18:25:45 +03:00
Torkel Ödegaard	fc69d59cae	dashboard folder search fix	2017-06-23 16:00:26 -04:00
Daniel Lee	6d86afd472	dashfolders: use canadmin permission in settings menu	2017-06-23 00:36:17 +02:00
Torkel Ödegaard	aa634402d9	dashboard acl fixes	2017-06-22 17:43:55 -04:00
Torkel Ödegaard	9c6c8c0f3f	acl fixes	2017-06-22 17:10:43 -04:00
Torkel Ödegaard	fcc8557dbb	dashboard acl work	2017-06-21 14:11:16 -04:00
Torkel Ödegaard	74840178cf	refactoring dashboard folder security checks	2017-06-19 15:22:42 -04:00
Torkel Ödegaard	cbbbccf12a	refactoring dashoard folder guardian	2017-06-17 18:24:38 -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	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
Daniel Lee	3913f16550	WIP: add permission check for GetDashboard	2017-06-12 16:48:51 +02:00