Commit Graph

10963 Commits

Author SHA1 Message Date
Torkel Ödegaard
76c4bfe268 ux: new metric segment is starting to work 2017-06-15 14:03:26 -04:00
Torkel Ödegaard
5f3b5fdcb2 updated 2017-06-15 12:21:12 -04:00
Torkel Ödegaard
6a95df403a refacoring: more work on metric segment replacement 2017-06-14 19:42:45 -04:00
Daniel Lee
699f9095e2 WIP: remove permissions when deleting global user 2017-06-14 23:45:30 +02:00
Torkel Ödegaard
380e7e7f04 Merge branch 'master' into metric-segment-remake 2017-06-14 16:17:13 -04:00
Torkel Ödegaard
41662b8540 dashboard_folders: updated 2017-06-14 12:55:21 -04:00
Daniel Lee
222a938cdf WIP: delete dependent permissions on user group delete 2017-06-14 18:40:08 +02:00
Torkel Ödegaard
210813f126 dashboard_folders: fixes to user picker & group picker 2017-06-14 12:32:43 -04:00
Torkel Ödegaard
908eb24d3a dashboard_folders: fixes to user & group picker 2017-06-14 12:21:05 -04:00
Torkel Ödegaard
3e8937e53b Merge branch 'master' into new-sidemenu 2017-06-14 10:00:43 -04:00
Torkel Ödegaard
81abfd4ca4 minor update 2017-06-14 10:00:40 -04:00
Torkel Ödegaard
581b977787 Merge branch 'master' of github.com:grafana/grafana 2017-06-13 18:32:38 -04:00
Torkel Ödegaard
c771dd4bd2 ux: metrics tab add query feature 2017-06-13 18:31:43 -04:00
Daniel Lee
92717ccafb WIP: permission checking for dash version api methods 2017-06-14 00:28:34 +02:00
Daniel Lee
cb720d8eaf docs: add body options for snapshot api 2017-06-13 23:17:14 +02:00
Torkel Ödegaard
9ff4ab1236 Merge branch 'master' into query_troubleshooting 2017-06-13 16:47:04 -04:00
Daniel Lee
1f92e589e8 exporter: query template var keeps refresh value..
on export if the value is not set to never. Otherwise the template
variable will not be populated with any values.""
2017-06-13 22:42:58 +02:00
Torkel Ödegaard
812ac5cb8e Merge branch 'master' of github.com:grafana/grafana 2017-06-13 13:22:08 -04:00
Torkel Ödegaard
7d642546b3 fix: restore dashboard history version did not reload route correctly when slug did not change 2017-06-13 13:21:22 -04:00
Daniel Lee
a861b1b9ba WIP: check permissions for delete/post dashboard 2017-06-12 23:05:32 +02:00
Daniel Lee
88e1fcb910 WIP: fixes after version history merge 2017-06-12 22:51:50 +02:00
Torkel Ödegaard
5061b3c691 ux: nav experiments 2017-06-12 21:11:22 +02:00
Trent White
192c447c2c create new auth icon for grafana.com so it doesn't share the same file as the main logo (#8581) 2017-06-12 17:17:00 +02:00
Daniel Lee
3913f16550 WIP: add permission check for GetDashboard 2017-06-12 16:48:51 +02:00
Torkel Ödegaard
f341a21b01 ux: side nav experiments 2017-06-12 16:46:02 +02:00
Daniel Lee
ef0facc987 WIP: fix test after merge conflict 2017-06-12 15:49:09 +02:00
Daniel Lee
9f79b9b8c5 WIP: fix go fmt error 2017-06-12 15:49:09 +02:00
Daniel Lee
18269a5886 WIP: user + user-group pickers for permissions 2017-06-12 15:49:09 +02:00
Daniel Lee
9eccb4e79f WIP: API - add dash permission 2017-06-12 15:49:09 +02:00
Daniel Lee
bc6aa74439 WIP: user-picker directive 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
96afb91ac4 WIP: fixes after navbar changes
Fixes for merge conflicts and navbar metadata
added for user group pages.
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
533f2d3d72 WIP: refactor folder-picker for dashlist 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
7381d2565d WIP: adds folder-picker to save as dialog 2017-06-12 15:49:09 +02:00
Daniel Lee
d081f85289 WIP: use metric-segment for folder picker 2017-06-12 15:49:09 +02:00
Daniel Lee
6c736e002a WIP: add dummy root folder to folder picker
Can move a dash from a folder back to root level as well
2017-06-12 15:49:09 +02:00
Daniel Lee
1e865211c9 WIP: Create new dashboard button in dash search 2017-06-12 15:49:09 +02:00
Daniel Lee
06a15eec5c WIP: permissions moved to settings tab. Adds folder dropdown to general settings tab 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
b4576edc90 WIP: fix after upstream sqlstore refactoring 2017-06-12 15:49:09 +02:00
Daniel Lee
764d25f007 WIP: rollback 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
fff7b706d6 WIP: user group additions 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
074ef7ce4e WIP: add open/closed folders icons for dash search
If browsing, then show open folder icon. If searching, show
the closed folder icon
2017-06-12 15:49:09 +02:00
Daniel Lee
13314f23ba WIP: Can remove dashboard permission - sql 2017-06-12 15:49:09 +02:00