Marcus Efraimsson
cef910dd78
Merge branch '7883_new_url_structure' of github.com:grafana/grafana into 7883_new_url_structure
2018-02-01 16:32:33 +01:00
Marcus Efraimsson
3db328f516
fix for dashboard/folder url's when having a sub path in root_url config
2018-02-01 16:30:48 +01:00
bergquist
74ca6f6dbf
changes dashboard url in alertlist
2018-02-01 14:08:51 +01:00
Marcus Efraimsson
cdf2fd64b7
route params from angular to view store should be updated on routeChangeSuccess
2018-02-01 13:28:04 +01:00
Marcus Efraimsson
ee9c408188
folders: changes needed due to merge
2018-02-01 13:21:24 +01:00
Marcus Efraimsson
ef90b3e49c
Merge branch '7883_new_url_structure' into 7883_frontend_step2
2018-02-01 11:08:39 +01:00
Marcus Efraimsson
b135df9a6c
Merge remote-tracking branch 'upstream/master' into 7883_new_url_structure
2018-02-01 10:48:06 +01:00
Marcus Efraimsson
40c83e3e22
dashboards: update dashboard/folder url if browser url is not the same as from backend
2018-01-31 18:40:54 +01:00
Marcus Efraimsson
8fc648ac43
dashboards: fix updating folder so that correct url is returned
2018-01-31 18:40:54 +01:00
Marcus Efraimsson
035b724725
dashboards: remove slug property in dashboard search responses
...
Removes slug property in dashboard search responses since this property isn't needed
anymore and it haven't been released to any stable release.
2018-01-31 18:40:54 +01:00
Marcus Efraimsson
92a0171a9b
folders: change the front end route for browsing folders
...
Change the front end route for folders to /dashboards/f/<uid>/<slug of folder title>.
Use new route for deleting dashboard/folder by uid.
Retrieve dashboard/folder by uid when moving or deleting dashboards/folders.
2018-01-31 18:40:54 +01:00
Torkel Ödegaard
75cf9ae27d
fix: use replace when redirecting to new url
2018-01-31 17:26:35 +01:00
Daniel Lee
a5197046e8
viewstore: fix test after merge
2018-01-31 16:49:41 +01:00
Daniel Lee
a9e2273064
Merge remote-tracking branch 'upstream/master' into dashboard_permissions
2018-01-31 16:45:32 +01:00
Daniel Lee
a0fc5383fd
dashfolders: fix for folder picker
...
If the selected folder is not in the options then manually create it. This
can happen in some edge cases (if an user has been given access to a
dashboard but does not have access to its parent folder)
2018-01-31 16:44:55 +01:00
Daniel Lee
2409d129c2
dashfolders: text change
2018-01-31 15:41:52 +01:00
Daniel Lee
9ef64d3056
dashfolders: special case for folders in root
...
Allow users to change permissions inherited from root.
2018-01-31 15:34:05 +01:00
Daniel Lee
a7e57bc2f8
spelling
2018-01-31 15:07:17 +01:00
Chris Rice
dba93d8240
Renamed "Period" to "Min period" in CloudWatch query editor ( #10665 )
2018-01-31 14:14:34 +01:00
Alexander Zobnin
56c526fad3
Repeat panels when row is expanding ( #10679 )
...
* fix: repeat panels when row is expanding
* repeat panel: change test name to more clear one
2018-01-31 14:13:47 +01:00
Marcus Efraimsson
57edf89033
dashboards: make scripted dashboards work using the old legacy urls
...
Scripted dashboards are still requested from /dashboard/script/scripted.js
#7883
2018-01-31 14:07:49 +01:00
Daniel Lee
1cfc81de74
playlist: fixes #10254
...
Closes #10254
2018-01-31 11:07:27 +01:00
Marcus Efraimsson
3efb3d8efa
dashboards: add new default frontend route for rendering a dashboard panel
...
New default route /d-solo/<uid>/<slug of dashboard title> where dashboard
panel are rendered by unique identifier and panel identifier.
If old route /dashboard-solo/db/<slug of dashboard tile> are used,
try to lookup dashboard by slug and redirect to new default route.
Change url logic for sharing a panel so that the new default route
for rendering a dashboard panel are used.
#7883
2018-01-31 11:01:23 +01:00
Daniel Lee
816c4d2340
url: fix for boolean querystring parameters
...
Without this fix then the querystring looks like ?abool=true which causes
a mismatch with the angular routing. This results in a redirect and messes
up the browser history and back button.
2018-01-31 09:58:21 +01:00
Marcus Efraimsson
7734df1d18
dashboards: fix links to recently viewed and starred dashboards
...
Use new property url from dashboard search for linking to dashboards
#7883
2018-01-31 00:48:36 +01:00
Marcus Efraimsson
f2014223b4
dashboards: use new *url* prop from dashboard search for linking to dashboards
...
#7883
2018-01-31 00:42:17 +01:00
Marcus Efraimsson
8009307c16
dashboards: when saving dashboard redirect if url changes
...
Redirect if new dashboard created or existing url changes.
#7883
2018-01-31 00:32:51 +01:00
Marcus Efraimsson
aefcff26a6
dashboards: add new default frontend route for loading a dashboard
...
New default route /d/<uid>/<slug of dashboard title> where dashboard
are loaded by unique identifier.
If old route /dashboard/db/<slug of dashboard tile> are used,
try to lookup dashboard by slug and redirect to new default route.
#7883
2018-01-31 00:27:51 +01:00
Marcus Efraimsson
6ab526881a
dashboards: ensure that uid is returned from getSaveModelClone
...
Without this the uid will not be sent to the backend when saving a
dashboard.
#7883
2018-01-31 00:06:31 +01:00
Daniel Lee
eb765d288c
alertlist: disable pause button when user does not have permission
2018-01-30 23:35:27 +01:00
Patrick O'Carroll
2c8e448559
moved icon ( #10681 )
2018-01-30 20:01:12 +01:00
Daniel Lee
4bc5945c17
dashfolders: remove inline styles
2018-01-30 17:26:44 +01:00
Alexander Zobnin
526960058a
repeat panel: minor refactor
2018-01-30 14:19:10 +03:00
Daniel Lee
0fb05bcf59
Merge remote-tracking branch 'upstream/master' into dashboard_permissions
2018-01-30 09:26:23 +01:00
ilgizar
1c95da8f23
Fix horizontal panel repeat. Fix #10672 .
2018-01-30 09:52:30 +05:00
Johannes Schill
ee57ed10f9
dashfolders: Add min-width to align icons in permissions list and some margin between icon and text #10275
2018-01-29 17:10:25 +01:00
Torkel Ödegaard
b1cf4cf01c
fix: InfluxDB Query Editor and selecting template variable in where clause caused issue, fixes #10402 , fixes #10663
2018-01-29 17:04:29 +01:00
Daniel Lee
d74a98feff
dashfolders: link to folder for inherited permissions
...
In the permissions view in dashboard settings, this adds a
link to the parent folder for inherited permissions. Which
allows the user to easily navigate to the folder and change
inherited permissions.
2018-01-29 16:10:47 +01:00
Johannes Schill
7900fd4a79
test: Update Tooltip test to check for className support
2018-01-29 15:54:59 +01:00
Alexander Zobnin
479658489a
fix: remove repeated rows when repeat was disabled. ( #10653 )
2018-01-29 15:17:27 +01:00
Johannes Schill
e6c161d897
test: Update Popover test to check for className support
2018-01-29 15:10:05 +01:00
Johannes Schill
51b0f2b0c8
dashfolders: Get rid of unused import #10275
2018-01-29 14:53:10 +01:00
Johannes Schill
787b493c00
dashfolders: Use grafana's question mark instead of FA's and use the react tooltip instead of angular's #10275
2018-01-29 14:53:10 +01:00
Johannes Schill
d9460d0b2b
dashfolders: Add className to Tooltip component
2018-01-29 14:51:28 +01:00
Alexander Zobnin
04053ec56c
fix: don't show manually hidden sidemenu after view mode toggle ( #10659 )
2018-01-29 14:33:41 +01:00
Daniel Lee
146af8595d
dashfolders: css class as parameter for Picker
...
For the permissions picker, pass in an extra class to decide
if the description should be aligned left or right.
2018-01-29 14:30:01 +01:00
Daniel Lee
5ee2d1de05
dashfolders: select with description for permissions
...
The dropdown for selecting permission is a new component built on
react-select that includes a description for the permission for
every option in the select.
2018-01-29 13:56:12 +01:00
Alexander Zobnin
b3ac85766e
fix: show sidebar after mouse wheel scrolling ( #10657 )
2018-01-29 13:38:37 +01:00
Torkel Ödegaard
a0323e96fa
fix: tweak of PR #10635
2018-01-29 10:46:05 +01:00
Torkel Ödegaard
dd4374cc65
Merge remote-tracking branch 'origin/10612_table-date-format'
2018-01-29 10:41:57 +01:00
