780d3e2c8f
fix for merge conflict
2017-12-14 15:50:47 +01:00
0f62b3e04d
resolve merge conflict
2017-12-14 15:15:54 +01:00
33f2e31393
replaced old table with filter-table, removed edit button, made whole rows to links
2017-12-14 14:30:13 +01:00
776c39fd79
templating: made templateSrv globally accessable as ES6 module, DashboardRow can not interpolate row title
2017-12-14 12:31:57 +01:00
9007e26106
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-12-14 12:10:59 +01:00
ff89531849
fix: ignore row clones in schema migration
2017-12-14 12:10:32 +01:00
e136b7c286
dashfolders: /dashboards should render index page with a 200 OK
2017-12-14 11:30:57 +01:00
196a05d487
dashfolders: bulk move/delete improvements
...
Use slug and url instead of uri
Check/uncheck a folder will check/uncheck all its children dashboards
Allow to move dashboards when there are both folders and dashboards selected
Hide the header of section when only managing one folder
#10081 #10181
2017-12-14 11:26:16 +01:00
fcca36a256
fix: after removed file
2017-12-14 09:46:55 +01:00
34cffc6b92
dashfolder: fix after backendSrv change
...
also removes unused create folder modal
2017-12-14 09:35:14 +01:00
f1b1dbc6dd
dashboard: fix test after merge conflict
2017-12-14 09:34:00 +01:00
c5c403b6ef
orgswitcher: update test
2017-12-14 09:02:23 +01:00
00e2413013
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-12-13 19:18:47 +01:00
a7645b710d
Merge remote-tracking branch 'origin/master' into develop
2017-12-13 19:18:10 +01:00
35106537f2
Replace Read Only Editor role with ViewersCanEdit setting ( #10166 )
...
* removes readonly editor role
* adds viewersCanEdit setting
This enable you to allow viewers to edit/inspect
dashboards in grafana in their own browser without
allowing them to save dashboards
* remove read only editor option from all dropdowns
* migrates all read only viewers to viewers
* docs: replace readOnlyEditor with viewersCanEdit
2017-12-13 18:53:42 +01:00
a583f92d16
dashfolders: bulk move dashboards synchronously
...
#10181
Also added better error handling when moving dashboards to other folders
2017-12-13 18:21:49 +01:00
d736795fe6
dashfolders: remove error message when moving to the same folder. #10135
2017-12-13 18:21:49 +01:00
26b8483fb0
teams: Fixes to edit team page
2017-12-13 18:20:49 +01:00
529fcc46c0
Merge remote-tracking branch 'origin/10172_team_edit' into develop
2017-12-13 18:13:16 +01:00
6254304667
Merge remote-tracking branch 'origin/select-wrapper' into develop
2017-12-13 18:12:35 +01:00
9fb5367eea
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-12-13 18:08:29 +01:00
2765c2ecc7
Merge branch 'develop-settings-links' into develop
2017-12-13 18:08:12 +01:00
e99f846a6f
ux: minor text change to #10177
2017-12-13 18:07:56 +01:00
c63569b6ce
made template link look like input ( #10198 )
2017-12-13 18:01:06 +01:00
7f0440fded
minor tweaks
2017-12-13 18:00:16 +01:00
a48ba7b19e
Dashboard grid fixes ( #10194 )
...
* grid: fix layout saving after panel move, #10185
* don't allow to drag fullscreen panels, #10171
2017-12-13 17:53:57 +01:00
90c5a8435f
refactor: minor change to #10199
2017-12-13 17:52:42 +01:00
04bb2b8ce8
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-12-13 17:49:08 +01:00
3cdf0af398
fix broken 'd r' shortcut (refresh dashboard) ( #10199 )
2017-12-13 17:48:58 +01:00
59ea19e03b
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-12-13 17:46:51 +01:00
1eeb421ddb
ux: updated login page
2017-12-13 17:46:14 +01:00
fa29ff0d79
fixes switching org when url contains orgId querystring param
2017-12-13 17:29:17 +01:00
8ea94817f5
build: fixed build issue
2017-12-13 16:56:24 +01:00
db95a01feb
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-12-13 16:31:11 +01:00
3c65015671
ux: refactoring login page change
2017-12-13 16:30:31 +01:00
7d0ca63b72
navmodel: fix for signout link on pref page
...
without a target property on the link, the signout tab on
the preferences page returned a 404.
2017-12-13 16:28:36 +01:00
f18eeaa920
change protip to go to manage dashboards
2017-12-13 16:08:32 +01:00
aa4f1fa971
Merge remote-tracking branch 'origin/9879-login' into develop-login2
2017-12-13 16:06:17 +01:00
d417a625d5
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-12-13 15:55:16 +01:00
313735bd75
search: worked on search results
2017-12-13 15:51:59 +01:00
3b783216fa
added select-wrapper to where it was missing for unified look
2017-12-13 15:05:43 +01:00
dfde6e75ed
changelog: adds note about closing #10151
2017-12-13 14:41:28 +01:00
c433597f99
Merge branch 'develop' into 9879-login
2017-12-13 14:21:39 +01:00
b8bfe51b03
ux: wip - Login animation POC ( #9879 )
2017-12-13 14:20:07 +01:00
ee5f030ded
changelog: adds note about closing #9318
2017-12-13 13:53:38 +01:00
0be9789364
ux: Move "Sign up" and "Reset password" to its own pages - and remove all inline styling ( #9879 )
2017-12-13 13:51:52 +01:00
bf999a4f82
fixes broken alert eval when first condition is using OR
...
closes #9318
2017-12-13 13:37:10 +01:00
ccbd18006e
ux: org user management changes
2017-12-13 13:16:44 +01:00
dd3dd407ad
removes unused property
2017-12-13 13:12:50 +01:00
29d1ec561f
fixed edit team header, fixes #10172
2017-12-13 12:48:49 +01:00
Patrick O'Carroll
Torkel Ödegaard
Marcus Efraimsson
Daniel Lee
Carl Bergquist
Alexander Zobnin
bergquist
Johannes Schill