Commit Graph

12508 Commits

Author SHA1 Message Date
bergquist
256f7176a2
teams: add team count when searching for team
closes #10207
2017-12-15 11:08:06 +01:00
Marcus Efraimsson
854d22fa8e dashfolders: bulk move/delete improvements
bulk delete dashboards synchronously
moved bulk delete and move dashboards to backend_srv
better error handling/messages when moving and deleting folders/dashboards
fixes #10181
2017-12-14 15:09:17 +01:00
Torkel Ödegaard
4f56d4ac07 snapshots: fixed snapshot issues, fixes #10214 2017-12-14 14:58:45 +01:00
Torkel Ödegaard
4e38526404 playlist: fixed playlist buttons in dashboard header, fixes #10213 2017-12-14 14:27:47 +01:00
Torkel Ödegaard
0085114d4e ux: minor changes to search input 2017-12-14 13:08:32 +01:00
Johannes Schill
b012131050 Magnifying glass on search fields #10188 (#10206)
* ux: Add magnifying glass icon to search input and remove the text label (#10188)

* ux: Add new look on search field to manage dashboards, users, teams, data sources, plugins. Change to use our own icon class instead of .fa (#10188)

* ux: Add new search look on org/users (#10188)
2017-12-14 12:46:00 +01:00
Torkel Ödegaard
776c39fd79 templating: made templateSrv globally accessable as ES6 module, DashboardRow can not interpolate row title 2017-12-14 12:31:57 +01:00
Torkel Ödegaard
9007e26106 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-12-14 12:10:59 +01:00
Torkel Ödegaard
ff89531849 fix: ignore row clones in schema migration 2017-12-14 12:10:32 +01:00
Marcus Efraimsson
e136b7c286 dashfolders: /dashboards should render index page with a 200 OK 2017-12-14 11:30:57 +01:00
Marcus Efraimsson
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
Daniel Lee
fcca36a256 fix: after removed file 2017-12-14 09:46:55 +01:00
Daniel Lee
34cffc6b92 dashfolder: fix after backendSrv change
also removes unused create folder modal
2017-12-14 09:35:14 +01:00
Daniel Lee
f1b1dbc6dd dashboard: fix test after merge conflict 2017-12-14 09:34:00 +01:00
Daniel Lee
c5c403b6ef orgswitcher: update test 2017-12-14 09:02:23 +01:00
Torkel Ödegaard
00e2413013 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-12-13 19:18:47 +01:00
Torkel Ödegaard
a7645b710d Merge remote-tracking branch 'origin/master' into develop 2017-12-13 19:18:10 +01:00
Carl Bergquist
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
Marcus Efraimsson
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
Marcus Efraimsson
d736795fe6 dashfolders: remove error message when moving to the same folder. #10135 2017-12-13 18:21:49 +01:00
Torkel Ödegaard
26b8483fb0 teams: Fixes to edit team page 2017-12-13 18:20:49 +01:00
Torkel Ödegaard
529fcc46c0 Merge remote-tracking branch 'origin/10172_team_edit' into develop 2017-12-13 18:13:16 +01:00
Torkel Ödegaard
6254304667 Merge remote-tracking branch 'origin/select-wrapper' into develop 2017-12-13 18:12:35 +01:00
Torkel Ödegaard
9fb5367eea Merge branch 'develop' of github.com:grafana/grafana into develop 2017-12-13 18:08:29 +01:00
Torkel Ödegaard
2765c2ecc7 Merge branch 'develop-settings-links' into develop 2017-12-13 18:08:12 +01:00
Torkel Ödegaard
e99f846a6f ux: minor text change to #10177 2017-12-13 18:07:56 +01:00
Patrick O'Carroll
c63569b6ce made template link look like input (#10198) 2017-12-13 18:01:06 +01:00
Torkel Ödegaard
7f0440fded minor tweaks 2017-12-13 18:00:16 +01:00
Alexander Zobnin
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
Torkel Ödegaard
90c5a8435f refactor: minor change to #10199 2017-12-13 17:52:42 +01:00
Torkel Ödegaard
04bb2b8ce8 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-12-13 17:49:08 +01:00
Alexander Zobnin
3cdf0af398 fix broken 'd r' shortcut (refresh dashboard) (#10199) 2017-12-13 17:48:58 +01:00
Torkel Ödegaard
59ea19e03b Merge branch 'develop' of github.com:grafana/grafana into develop 2017-12-13 17:46:51 +01:00
Torkel Ödegaard
1eeb421ddb ux: updated login page 2017-12-13 17:46:14 +01:00
Daniel Lee
fa29ff0d79 fixes switching org when url contains orgId querystring param 2017-12-13 17:29:17 +01:00
Torkel Ödegaard
8ea94817f5 build: fixed build issue 2017-12-13 16:56:24 +01:00
Torkel Ödegaard
db95a01feb Merge branch 'develop' of github.com:grafana/grafana into develop 2017-12-13 16:31:11 +01:00
Torkel Ödegaard
3c65015671 ux: refactoring login page change 2017-12-13 16:30:31 +01:00
Daniel Lee
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
bergquist
f18eeaa920 change protip to go to manage dashboards 2017-12-13 16:08:32 +01:00
Torkel Ödegaard
aa4f1fa971 Merge remote-tracking branch 'origin/9879-login' into develop-login2 2017-12-13 16:06:17 +01:00
Torkel Ödegaard
d417a625d5 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-12-13 15:55:16 +01:00
Torkel Ödegaard
313735bd75 search: worked on search results 2017-12-13 15:51:59 +01:00
Patrick O'Carroll
3b783216fa added select-wrapper to where it was missing for unified look 2017-12-13 15:05:43 +01:00
bergquist
dfde6e75ed changelog: adds note about closing #10151 2017-12-13 14:41:28 +01:00
Johannes Schill
c433597f99 Merge branch 'develop' into 9879-login 2017-12-13 14:21:39 +01:00
Johannes Schill
b8bfe51b03 ux: wip - Login animation POC (#9879) 2017-12-13 14:20:07 +01:00
bergquist
ee5f030ded changelog: adds note about closing #9318 2017-12-13 13:53:38 +01:00
Johannes Schill
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
bergquist
bf999a4f82 fixes broken alert eval when first condition is using OR
closes #9318
2017-12-13 13:37:10 +01:00