989 Commits

Author SHA1 Message Date
a4910c7aea merging new-sidenav 2017-06-22 18:11:29 -04:00
aa634402d9 dashboard acl fixes 2017-06-22 17:43:55 -04: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
f68d2816ab dashfolders: security for png rendering 2017-06-22 01:23:48 +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
34cf305d2c Merge branch 'master' into dashboard_folders 2017-06-19 16:40:30 -04:00
74840178cf refactoring dashboard folder security checks 2017-06-19 15:22:42 -04:00
f7194878fe dashboard guardian refactoring starting to work 2017-06-19 13:47:44 -04:00
d6341162cb refactoring dashboad folder acl checks 2017-06-19 11:54:37 -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
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
3fe031d25d refactoring: Dashboard guardian 2017-06-16 21:25:24 -04:00
5cf40cbd12 WIP: move guardian logic for search into the sql query 2017-06-17 02:34:05 +02:00
d9dca72ee4 dashboard_folders: refactoring picker and folder selection in dashboard settings & save as menu 2017-06-16 16:57:37 -04:00
dd02bf7c9b WIP: adds API check to stop folders being included in folders 2017-06-16 02:45:47 +02:00
699f9095e2 WIP: remove permissions when deleting global user 2017-06-14 23:45:30 +02:00
92717ccafb WIP: permission checking for dash version api methods 2017-06-14 00:28:34 +02:00
a861b1b9ba WIP: check permissions for delete/post dashboard 2017-06-12 23:05:32 +02:00
5061b3c691 ux: nav experiments 2017-06-12 21:11:22 +02:00
3913f16550 WIP: add permission check for GetDashboard 2017-06-12 16:48:51 +02:00
9eccb4e79f WIP: API - add dash permission 2017-06-12 15:49:09 +02:00
2097ed0bb8 WIP: Permission Type as string in permission query 2017-06-12 15:49:09 +02:00
5c89c4b2bd WIP: dashlist in template for new folder 2017-06-12 15:49:09 +02:00
c602afb9c6 WIP: dashboard search by folder + toggle for list or tree mode 2017-06-12 15:49:09 +02:00
82afe8228f WIP: add parentid to getdashboard query result 2017-06-12 15:49:09 +02:00
68b9342de3 WIP: dashboard search by type (folder or dash) 2017-06-12 15:49:09 +02:00
fa18b0053d WIP: delete permission in API 2017-06-12 15:49:09 +02:00
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
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
552935031b WIP: API methods for add/remove members to user group 2017-06-12 15:49:09 +02:00
0a1df0905e WIP: add update user group command 2017-06-12 15:49:09 +02:00
233cd7af4a WIP: add user group search 2017-06-12 15:49:09 +02:00
1248728d7f WIP: rough prototype of dashboard folders
Breaks some stuff like selected dash in the search result.
In dashboard search, if the user is not searching then the result is
returned as a tree structure. No ACL's or user group ux yet.
2017-06-12 15:49:09 +02:00
922073a357 (cloudwatch) add new metrics (#8569) 2017-06-08 07:01:33 +02:00
46412c8475 dasboard_history: security fix, added orgId filter to dashboard version lookup 2017-06-07 14:21:40 +02:00
8f6c9c5946 dasboard_history: some polish around styles & diff colors, and minor fixes 2017-06-07 12:39:06 +02:00
ef1dfed0d8 dasboard_history: big refactoring of how the compare api looked, now a POST with a model for new & base version, refactored a simplified UI code as well, this was done to lay foundation to make it possible to do diff against current in browser unsaved version 2017-06-07 11:50:09 +02:00
948e5ae74d dashboard_history: further css & markup fixes, removing style overrides & resuing existing styles and markup components 2017-06-06 23:04:14 +02:00
7b5f7ed553 dashboard_history: SQL did not work when using MySQL, fixes to dashboard version numbering, so inserts start at 1, added migration to fix old dashboards with version 0 2017-06-06 15:40:10 +02:00