Commits · 12b08b61d7c611bd7fa33ccf358223ba4f512303 · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

23 Jan, 2018 7 commits
- Merge remote-tracking branch 'origin/graphite-query-editor-enhancements' · 12b08b61
  Torkel Ödegaard committed Jan 23, 2018
  
  12b08b61 Browse Files
- Merge branch 'master' of github.com:grafana/grafana · 3662b03d
  Torkel Ödegaard committed Jan 23, 2018
  
  3662b03d Browse Files
- refactor: minor refactoring of PR #10560 · dbfaf5da
  Torkel Ödegaard committed Jan 23, 2018
  
  dbfaf5da Browse Files
- cloudwatch: fix ebs_volume_ids by create a client-session before call… · d82af23f
```
cloudwatch: fix ebs_volume_ids by create a client-session before call ec2:DescribeInstances. (#10566)
```
  hannes committed Jan 23, 2018
  d82af23f Browse Files
- Merge branch 'generic-oauth-jwt' of https://github.com/DanCech/grafana · a24aa3ae
  Torkel Ödegaard committed Jan 23, 2018
  
  a24aa3ae Browse Files
- docker: use mysql and postgres from latest fake-data-gen · 1ce6a420
  Marcus Efraimsson committed Jan 23, 2018
  
  1ce6a420 Browse Files
- Merge pull request #10584 from bkaganyildiz/update-opsgenie-notifier · e24d9a62
```
Update OpsGenie Notifier to support different api domains.
```
  Carl Bergquist committed Jan 23, 2018
  e24d9a62 Browse Files
22 Jan, 2018 13 commits
- Update OpsGenie Notifier to support different api domains. · 97d969bd
  bkaganyildiz committed Jan 22, 2018
  
  97d969bd Browse Files
- 10583 panel resize icon fix (#10585) · c611ffa4
```
* removed svg, added ::after

* removed unnecessary code
```
  Patrick O'Carroll committed Jan 22, 2018
  c611ffa4 Browse Files
- Merge pull request #10587 from grafana/10580_search_bug · f8a03fa3
```
dashboards: Fix issue with first click when expanding folder in search
```
  Marcus Efraimsson committed Jan 22, 2018
  f8a03fa3 Browse Files
- dashboards: Fix issue with first click when expanding folder in search · b5a6a9ab
```
Fixes #10580
```
  Marcus Efraimsson committed Jan 22, 2018
  b5a6a9ab Browse Files
- cfg: adds info about local img uploader to docs · 5546828b
  bergquist committed Jan 22, 2018
  
  5546828b Browse Files
- docs: adds info about local img uploader · 704a198f
  bergquist committed Jan 22, 2018
  
  704a198f Browse Files
- changelog: adds note about closing #6922 · b98dd680
  bergquist committed Jan 22, 2018
  
  b98dd680 Browse Files
- Merge pull request #10059 from FunkyM/local-image-store · 184e7046
```
Add support for internal image store
```
  Carl Bergquist committed Jan 22, 2018
  184e7046 Browse Files
- changelog: note about closing #9664 · 6780e00c
  bergquist committed Jan 22, 2018
  
  6780e00c Browse Files
- Merge pull request #9664 from mtanda/prometheus_on_by · 89ae4d66
```
(prometheus) show label name in paren after by/without/on/ignoring/group_left/group_right
```
  Carl Bergquist committed Jan 22, 2018
  89ae4d66 Browse Files
- changelog: adds note about closing #9770 · 9678be15
  bergquist committed Jan 22, 2018
  
  9678be15 Browse Files
- Merge pull request #10574 from Jonnymcc/disable-mode-options-line-points-unchecked · 27d103ad
```
Disable instead of hide mode options when line/points is unchecked
```
  Carl Bergquist committed Jan 22, 2018
  27d103ad Browse Files
- Merge pull request #10572 from Jonnymcc/add-lumens-unit · 397da7a4
```
Add lumens unit
```
  Carl Bergquist committed Jan 22, 2018
  397da7a4 Browse Files
21 Jan, 2018 1 commit
- Disable instead of hide mode options when line/points is unchecked · f516c82d
  Jonathan McCall committed Jan 20, 2018
  
  f516c82d Browse Files
20 Jan, 2018 1 commit
- Add lumens unit · 88e1ec33
  Jonathan McCall committed Jan 19, 2018
  
  88e1ec33 Browse Files
19 Jan, 2018 8 commits
- add docs for configuring OAuth with Auth0 and Azure AD · 562aa580
  Dan Cech committed Jan 19, 2018
  
  562aa580 Browse Files
- Merge pull request #10556 from Ultimation/patch-1 · 1de00ded
```
Recommend a limit on database query for influxdb annotations
```
  Carl Bergquist committed Jan 19, 2018
  1de00ded Browse Files
- install dep instead of govendor on setup · 278337e4
  bergquist committed Jan 19, 2018
  
  278337e4 Browse Files
- Merge pull request #10563 from grafana/golang_dep · 987a546e
```
Migrated from govendor to dep
```
  Carl Bergquist committed Jan 19, 2018
  987a546e Browse Files
- remove unused code from vendor · 7ed643f3
  bergquist committed Jan 19, 2018
  
  7ed643f3 Browse Files
- migrate from govendor to dep · e023f79c
  bergquist committed Jan 19, 2018
  
  e023f79c Browse Files
- fix: cloudwatch corrected error handling so original error is not thrown away · 4f59d229
  Torkel Ödegaard committed Jan 19, 2018
  
  4f59d229 Browse Files
- go fmt · a09044a4
  Dan Cech committed Jan 18, 2018
  
  a09044a4 Browse Files
18 Jan, 2018 10 commits
- support for decoding JWT id tokens · 04e17c14
  Dan Cech committed Jan 18, 2018
  
  04e17c14 Browse Files
- Merge remote-tracking branch 'origin/mattttt-style-tweaks' · 4720b86f
  Torkel Ödegaard committed Jan 18, 2018
  
  4720b86f Browse Files
- Generic Oauth Support for ADFS (#9242) · 5bb22b83
```
* check upn field if email address isn't present, support for adfs

* correctly set login to the user's email address if not specified by the oauth server

* break up GenericOAuth.UserInfo into helper functions
```
  Dan Cech committed Jan 18, 2018
  5bb22b83 Browse Files
- Recommend a limit on database query · 8368bfea
```
Users not putting a limit on can end up causing bad performance. A recommended limit in the placehold is a quick little help.
```
  Andrew Cottrell committed Jan 18, 2018
  8368bfea Browse Files
- Adjusted the border color on the buttons in dashboard nav, fixed alert email… · 0dffb6db
```
Adjusted the border color on the buttons in dashboard nav, fixed alert email text area width, fixed padding-top issue on dashboard settings aside
```
  Matt committed Jan 18, 2018
  0dffb6db Browse Files
- mysql: convert numbers to text for annotation tooltip · 1a019052
  Daniel Lee committed Jan 18, 2018
  
  1a019052 Browse Files
- mysql: update to use ColumnTypes interface in new version · 6d136452
```
The custom code in vendor is not needed anymore and most of the
mapping code can be replaced.
```
  Daniel Lee committed Jan 18, 2018
  6d136452 Browse Files
- mysql: update mysql driver to latest master · 7bc7af6c
```
The latest master implements the ColumnType interface.

See https://github.com/go-sql-driver/mysql/issues/495

This removes the custom code in the vendor folder that
did a ColumnType mapping.
```
  Daniel Lee committed Jan 18, 2018
  7bc7af6c Browse Files
- gofmt my dear friend · a3264419
  bergquist committed Jan 18, 2018
  
  a3264419 Browse Files
- ux: updated react-layout-grid · 7dc046d9
  Torkel Ödegaard committed Jan 18, 2018
  
  7dc046d9 Browse Files