20 Commits

Author SHA1 Message Date
41e01184aa Merge branch 'master' into develop 2017-09-18 12:32:29 +02:00
545b02139d Merge branch 'dashboard_folders' of github.com:grafana/grafana into dashboard_folders 2017-06-22 17:11:39 -04:00
9c6c8c0f3f acl fixes 2017-06-22 17:10:43 -04:00
1d43bfbf3f dashfolders: new admin permission needed to view/change acl 2017-06-22 23:01:04 +02:00
2257c1f874 dashboard acl work 2017-06-21 19:02:03 -04:00
fcc8557dbb dashboard acl work 2017-06-21 14:11:16 -04:00
43ffe826fa dashboard acl work 2017-06-20 17:18:20 -04:00
212a66ae5f Merge branch 'dashboard_folders' of github.com:grafana/grafana into dashboard_folders 2017-06-19 18:55:34 -04:00
812112f2f6 WIP: fix acl route 2017-06-20 00:34:25 +02:00
e290015887 refactoring: renaming 2017-06-19 18:19:58 -04:00
aaf2a897b0 folders: changed api urls for dashboard acls 2017-06-19 18:11:30 -04:00
c4a1803060 refactoring more renaming 2017-06-19 17:30:54 -04:00
e0b9ba7554 refactoring renaming dashboard folder operations 2017-06-19 17:15:25 -04:00
f7194878fe dashboard guardian refactoring starting to work 2017-06-19 13:47:44 -04:00
b494fd7689 dashboard folders acl work 2017-06-19 11:03:54 -04:00
cbbbccf12a refactoring dashoard folder guardian 2017-06-17 18:24:38 -04:00
699f9095e2 WIP: remove permissions when deleting global user 2017-06-14 23:45:30 +02:00
9eccb4e79f WIP: API - add dash permission 2017-06-12 15:49:09 +02:00
fa18b0053d WIP: delete permission in API 2017-06-12 15:49:09 +02:00
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