bergquist 8573f73d72 Merge branch 'master' into backend_plugins ... * master: (584 commits) prometheus: change default resolution to 1/1 fix: viewers can edit now works correctly fix: fixed minor ux and firefox issues, fixes #10228 ux: minor fixes profile: use name or fallback for profile page fix: sidemenu profile main text is now username instead of name build: update master version to 5.0.0-pre1 dashfolder: change to migration text ux:s sidemenu icon rules teams: add team count when searching for team changed background color for infobox and new blues in light theme, light theme now uses blue-dark in panel query (#10211) ux: fixed navbar issue when sidemenu closes ux: minor position change for layout selector, fixes #10217 fix: view json from share modal now works, #10217 ux: used new add data sources icon dashfolders: styling of selected filters dashfolders: styling of selected filters dashfolders: fix moving plugin dashboard to folder changelog: adds note about closing #9170 dashfolders: fix folder selection dropdown in dashboard settings ...		2017-12-15 14:34:55 +01:00
..
main.go	Merge branch 'master' into develop	2017-12-12 13:19:07 +01:00
server.go	backend plugins: manage plugins lifecycle with context	2017-12-11 15:05:06 +01:00