Skip to content

Commit

Permalink
Merge remote-tracking branch 'grafana/master' into reuse-query2
Browse files Browse the repository at this point in the history
* grafana/master: (33 commits)
  Panels: Fixed alert icon position in panel header (grafana#17070)
  GraphPanel: use SeriesData directly (skip legacy transformation) (grafana#17037)
  Streaming: support streaming in MetricsPanelCtrl (grafana#17034)
  Gauge: Fix switching orientation issue when switching from BarGauge to Gauge (grafana#17064)
  serverlock: run tests async should be more linear time wise (grafana#17059)
  InfoPopover: Fixes transclude undefined error (grafana#17063)
  Dashboard: Fixes lazy loading & expanding collapsed rows on mobile (grafana#17055)
  fix: Azure Monitor adds missing closing div tag to query editor (grafana#17057)
  Chore: Use executable dir instead of pwd in CLI for isDev check (grafana#16974)
  Search: Set element height to 100% to avoid Chrome 74's overflow (grafana#17054)
  Docs: adds note about removing session storage (grafana#17003)
  Chore: remove use of `== false` (grafana#17036)
  Explore: use @grafana/ui legend (grafana#17027)
  tech: avoid alias for importing models in alerting (grafana#17041)
  DataSourcePlugin: support custom tabs (grafana#16859)
  Dashboard: Fixes scrolling issues for Edge browser (grafana#17033)
  SeriesData: remove color from Field (grafana#17044)
  chore: remove x character in explore
  Dashboard: show refresh button in kiosk mode (grafana#17032)
  Devenv: Updated gauge test dashboard
  ...
  • Loading branch information
ryantxu committed May 14, 2019
2 parents 33032dc + 238a929 commit 45c6035
Show file tree
Hide file tree
Showing 329 changed files with 5,370 additions and 2,725 deletions.
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ RUN ./node_modules/.bin/grunt build
# Final container
FROM debian:stretch-slim

LABEL maintainer="Grafana team <[email protected]>"

ARG GF_UID="472"
ARG GF_GID="472"

Expand Down
Loading

0 comments on commit 45c6035

Please sign in to comment.