Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Local OAuth Redirect #11

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Local OAuth Redirect #11

wants to merge 6 commits into from

Commits on May 9, 2019

  1. copy patch from ryantxu

    ryantxu committed May 9, 2019
    Configuration menu
    Copy the full SHA
    a95d242 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2019

  1. Merge branch 'master' into natel-oauth-redirect

    * master:
      explore: add some extra time for angular query editors to update query (grafana#16955)
      Explore: Align Explore with Dashboards and Panels (grafana#16823)
      Explore: Fix empty result from datasource should render logs container (grafana#16999)
      Explore: Fixes zoom exception in Loki/Graph (grafana#16991)
      PanelEditor: Fix queries tab now showing, wrong skipDataQuery logic (grafana#16994)
      DataSourceApi:  convert interface to abstract class (grafana#16979)
      Panels: Fixed error panel tooltip (grafana#16993)
      Docker: Prevent a permission denied error when writing files to the default provisioning directory (grafana#16831)
      Notification: attempt to send notifications to all given email addresses (grafana#16881)
      GettingStarted: convert to react panel plugin (grafana#16985)
      Plugins: Remove dataFormats key and add skipDataQuery (grafana#16984)
      AlertList: removed icon
      MetricsPanelCtrl: use shared queryRunner to support query execution (grafana#16659)
    ryantxu committed May 10, 2019
    Configuration menu
    Copy the full SHA
    04ee262 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2019

  1. Merge branch 'master' into natel-oauth-redirect

    * master: (49 commits)
      add support for periodically reloading mysql client certs (grafana#14892)
      Chore: Deduplicate sqlstore transaction code (grafana#17069)
      Alertmanager: Replace illegal chars with underscore in label names (grafana#17002)
      Adjusted documentation for gcs to reflect the code (grafana#16947)
      fix: Initial url update in Explore should replace existing url history grafana#17030 (grafana#17061)
      Explore: Allow switching between metrics and logs  (grafana#16959)
      Chore: explore possibilities of using makefile (grafana#17039)
      Chore: Bump jest to 24.8.0 (grafana#17094)
      Chore: Bump ts-node to 8.1.0 (grafana#17093)
      Release: Updated changelog
      backend: replace /pkg/errors with errutil (grafana#17065)
      Explore: Fixes filtering in Prometheus queries when clicking in Table (grafana#17083)
      Remotecache: Avoid race condition in Set causing error on insert.  (grafana#17082)
      Build: Support publishing MSI to grafana.com (grafana#17073)
      InputDataSource: better empty value support (grafana#17075)
      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)
      ...
    ryantxu committed May 16, 2019
    Configuration menu
    Copy the full SHA
    d47d429 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2019

  1. Merge remote-tracking branch 'grafana/master' into natel-oauth-redirect

    * grafana/master:
      Feature: LDAP refactoring (grafana#16950)
      explore: fix issues when loading and both graph/table are collapsed  (grafana#17113)
      explore: make sure datasource is added to target (grafana#17116)
      Fix: tighten revive exit code & make it happy (grafana#17127)
      GraphPanel: Don't sort series when legend table & sort column is not visible  (grafana#17095)
      Chore: Update grafana-ui version to 6.2.0-alpha.0 (grafana#17109)
    ryantxu committed May 17, 2019
    Configuration menu
    Copy the full SHA
    8f604a4 View commit details
    Browse the repository at this point in the history
  2. redirect again to root?

    ryantxu committed May 17, 2019
    Configuration menu
    Copy the full SHA
    af677e7 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'master' into natel-oauth-redirect

    * master:
      Chore: fix codespell issue with build (grafana#17144)
    ryantxu committed May 17, 2019
    Configuration menu
    Copy the full SHA
    30355e3 View commit details
    Browse the repository at this point in the history