 Torkel Ödegaard
|
d9dca72ee4
|
dashboard_folders: refactoring picker and folder selection in dashboard settings & save as menu
|
2017-06-16 16:57:37 -04:00 |
|
|
Torkel Ödegaard
|
5b35a21d6f
|
Merge branch 'dashboard_folders' of github.com:grafana/grafana into dashboard_folders
|
2017-06-16 14:56:46 -04:00 |
|
|
Torkel Ödegaard
|
0ad4a0faa9
|
Merge branch 'master' into dashboard_folders
|
2017-06-16 13:08:45 -04:00 |
|
|
Torkel Ödegaard
|
724368d0cd
|
fix: data source dropdown select
|
2017-06-16 11:43:37 -04:00 |
|
|
Torkel Ödegaard
|
25f88e9b3a
|
Merge branch 'master' of github.com:grafana/grafana
|
2017-06-16 10:47:53 -04:00 |
|
|
Torkel Ödegaard
|
39ffb04be1
|
Merge branch 'revert-dashboard-search-nav'
|
2017-06-16 10:47:28 -04:00 |
|
|
Torkel Ödegaard
|
056c57d551
|
ux: temporary remove search
|
2017-06-16 10:47:17 -04:00 |
|
 Brandon Arp
|
5d63ad21c1
|
allow heatmap parsing of scaled datapoints (#8632)
|
2017-06-16 10:45:52 -04:00 |
|
|
Torkel Ödegaard
|
a49e82e447
|
ux: revert dashboard search nav change, this is a tempoary change until we redesign the sidenav
|
2017-06-16 09:47:21 -04:00 |
|
 Daniel Lee
|
dd02bf7c9b
|
WIP: adds API check to stop folders being included in folders
|
2017-06-16 02:45:47 +02:00 |
|
|
Torkel Ödegaard
|
7a39578f33
|
use gf-form-dropdown in user picker
|
2017-06-15 16:38:00 -04:00 |
|
|
Torkel Ödegaard
|
e63fa9c83c
|
Merge branch 'master' into dashboard_folders
|
2017-06-15 16:23:10 -04:00 |
|
|
Torkel Ödegaard
|
e9c8881d54
|
Merge branch 'metric-segment-remake'
|
2017-06-15 15:56:41 -04:00 |
|
|
Torkel Ödegaard
|
840099bec0
|
refactor: metric segment remake
|
2017-06-15 15:56:24 -04:00 |
|
|
Daniel Lee
|
29ec05298e
|
WIP: add test for add user group permission
|
2017-06-15 20:39:27 +02:00 |
|
|
Daniel Lee
|
0e853163fd
|
WIP: can edit dashboard permission
|
2017-06-15 20:21:14 +02:00 |
|
|
Daniel Lee
|
9e7aa65fb7
|
WIP: clean up after user and org user delete
|
2017-06-15 20:19:54 +02:00 |
|
|
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
|
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 |
|
 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 |
|
|
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 |
|