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

Use natel branding #5

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

Use natel branding #5

wants to merge 19 commits into from

Commits on May 6, 2019

  1. natel branding

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

Commits on May 10, 2019

  1. Merge branch 'master' into v6-branding

    * master: (53 commits)
      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)
      TableData: support name (grafana#16983)
      Changelog: Typo guage -> gauge (grafana#16982)
      TestData: stream via fetch (grafana#16963)
      plugins: fix how datemath utils are exposed to plugins (grafana#16976)
      NewDataSource: Updated page header title
      fix(prometheus): issue with click label to filter for recording rules in Explore
      Explore: Removes Promise.All from runQueries thunk (grafana#16957)
      ...
    ryantxu committed May 10, 2019
    Configuration menu
    Copy the full SHA
    969e270 View commit details
    Browse the repository at this point in the history
  2. merge master

    ryantxu committed May 10, 2019
    Configuration menu
    Copy the full SHA
    899728c View commit details
    Browse the repository at this point in the history
  3. put back the test

    ryantxu committed May 10, 2019
    Configuration menu
    Copy the full SHA
    3242bab View commit details
    Browse the repository at this point in the history
  4. fix test

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

Commits on May 11, 2019

  1. update test

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

Commits on May 13, 2019

  1. upstream footer

    ryantxu committed May 13, 2019
    Configuration menu
    Copy the full SHA
    04c57fe View commit details
    Browse the repository at this point in the history
  2. fix test

    ryantxu committed May 13, 2019
    Configuration menu
    Copy the full SHA
    a8ed5d2 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'v6-branding' of github.com:natelenergy/grafana into v6-…

    …branding
    
    * 'v6-branding' of github.com:natelenergy/grafana:
      update test
      fix test
      put back the test
      merge master
      natel branding
    ryantxu committed May 13, 2019
    Configuration menu
    Copy the full SHA
    39c96c2 View commit details
    Browse the repository at this point in the history
  4. remove snapshots

    ryantxu committed May 13, 2019
    Configuration menu
    Copy the full SHA
    51bb0ac View commit details
    Browse the repository at this point in the history
  5. remove snapshots

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

Commits on May 15, 2019

  1. merge master

    ryantxu committed May 15, 2019
    Configuration menu
    Copy the full SHA
    d8d4859 View commit details
    Browse the repository at this point in the history
  2. merge master

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

Commits on May 16, 2019

  1. Merge branch 'master' into v6-branding

    * master:
      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)
    ryantxu committed May 16, 2019
    Configuration menu
    Copy the full SHA
    8e95af2 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 v6-branding

    * 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
    78d763a View commit details
    Browse the repository at this point in the history
  2. merge master

    ryantxu committed May 17, 2019
    Configuration menu
    Copy the full SHA
    9aeebff View commit details
    Browse the repository at this point in the history
  3. merge master

    ryantxu committed May 17, 2019
    Configuration menu
    Copy the full SHA
    94f89dd View commit details
    Browse the repository at this point in the history
  4. Merge branch 'master' into v6-branding

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

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