Torkel Ödegaard
c395237710
Merge branch Grafana v5 'develop' branch
2017-12-15 12:06:09 +01:00
Torkel Ödegaard
8905c8e5fb
Merge branch 'team_member_count' of https://github.com/bergquist/grafana into develop
2017-12-15 11:53:47 +01:00
Torkel Ödegaard
75bfe313d7
Merge remote-tracking branch 'origin/develop-filter-table' into develop
2017-12-15 11:44:51 +01:00
Daniel Lee
2b814738c1
dashfolder: change to migration text
...
First index for the dashboard_acl table had the word
unique in the migration description even though the
index is not unique
2017-12-15 11:35:14 +01:00
Torkel Ödegaard
ff0c2b496f
ux:s sidemenu icon rules
2017-12-15 11:18:22 +01:00
bergquist
256f7176a2
teams: add team count when searching for team
...
closes #10207
2017-12-15 11:08:06 +01:00
Torkel Ödegaard
68ab11d7bf
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-12-15 11:01:30 +01:00
Patrick O'Carroll
c78f1834bd
changed background color for infobox and new blues in light theme, light theme now uses blue-dark in panel query ( #10211 )
2017-12-15 11:01:18 +01:00
Torkel Ödegaard
313d20292e
ux: fixed navbar issue when sidemenu closes
2017-12-15 10:28:45 +01:00
Torkel Ödegaard
9a711a4fc3
ux: minor position change for layout selector, fixes #10217
2017-12-15 09:58:39 +01:00
Torkel Ödegaard
3300af909a
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-12-15 09:50:18 +01:00
Torkel Ödegaard
ba3dbac50d
fix: view json from share modal now works, #10217
2017-12-15 09:49:57 +01:00
Torkel Ödegaard
69305c20a0
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-12-15 09:29:41 +01:00
Torkel Ödegaard
25d8f21b64
ux: used new add data sources icon
2017-12-15 09:19:29 +01:00
Marcus Efraimsson
a84e03ddc4
dashfolders: styling of selected filters
...
#10081
2017-12-15 09:14:10 +01:00
Marcus Efraimsson
bd7837e8d7
dashfolders: styling of selected filters
...
#10081
2017-12-14 20:20:36 +01:00
Torkel Ödegaard
581257416e
Merge remote-tracking branch 'origin/develop-icons' into develop
2017-12-14 19:56:19 +01:00
Marcus Efraimsson
62e6fed5ce
dashfolders: fix moving plugin dashboard to folder
...
If moving a dashboard and the server responds with a plugin-dashboard
error we add the overwrite flag and moving the dashboard again.
Fixes #10183
2017-12-14 16:51:23 +01:00
bergquist
11fd401fad
changelog: adds note about closing #9170
2017-12-14 15:59:49 +01:00
Marcus Efraimsson
b1bb012343
dashfolders: fix folder selection dropdown in dashboard settings
...
Use folder id from meta instead of dashboard object
2017-12-14 15:58:24 +01:00
Carl Bergquist
f5d26bfcc9
Merge pull request #10050 from davkal/davkal/multi-query-table
...
Add support to render values of multiple queries in the same table
2017-12-14 15:57:07 +01:00
Patrick O'Carroll
780d3e2c8f
fix for merge conflict
2017-12-14 15:50:47 +01:00
Carl Bergquist
45eda16a87
Merge pull request #10203 from queeno/dashboard_provisioner_id_validation
...
Avoid ID validation before provisioning dashboards
2017-12-14 15:43:07 +01:00
Trent White
764992df2a
add links for large cta
2017-12-14 09:31:59 -05:00
Patrick O'Carroll
0f62b3e04d
resolve merge conflict
2017-12-14 15:15:54 +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
bergquist
4a433ee630
docs: include all notifiers type
2017-12-14 14:45:17 +01:00
Patrick O'Carroll
33f2e31393
replaced old table with filter-table, removed edit button, made whole rows to links
2017-12-14 14:30:13 +01:00
Torkel Ödegaard
4e38526404
playlist: fixed playlist buttons in dashboard header, fixes #10213
2017-12-14 14:27:47 +01:00
Torkel Ödegaard
66ca8a6621
Update CHANGELOG.md
2017-12-14 13:58:33 +01:00
Torkel Ödegaard
88e9012cef
Update CHANGELOG.md
2017-12-14 13:58:11 +01:00
bergquist
f6f9e58d45
docs: update latest version to 4.6.3
2017-12-14 13:45:44 +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
Robin Gustafsson
cf7a49977f
proxyds: delete cookies except those listed in keepCookies
2017-12-14 11:46:44 +01:00
Daniel Lee
bcc85862fe
dshttpsettings: Move whitelisted cookies to end of config page
2017-12-14 11:46:44 +01:00
Daniel Lee
f1aa7dcd52
proxyds: failing test for keepCookies
...
If the cookies are specified in the keepCookies property then they
should not be deleted from proxied requests for data sources
2017-12-14 11:46:44 +01:00
Daniel Lee
592cb386e2
dshttpsettings: add field for cookies that should be kept
...
The ds proxy strips out cookies. Cookie names specified in
this field will not be stripped out. This is the frontend
change only.
2017-12-14 11:46:44 +01:00
Marcus Efraimsson
e136b7c286
dashfolders: /dashboards should render index page with a 200 OK
2017-12-14 11:30:57 +01:00
bergquist
43ac2b1dba
update version for packagecloud
2017-12-14 11:30:10 +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
bergquist
294a6a0046
add release date for 4.6.3
2017-12-14 11:20:34 +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
