Commits · c663e32ea89afea931d2c5df002cfbc66e7e1f52 · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

19 Aug, 2016 1 commit
- Merge branch 'database_url' of https://github.com/Scalingo/grafana into Scalingo-database_url · c663e32e
  bergquist committed Aug 19, 2016
  
  c663e32e Browse Files
18 Aug, 2016 5 commits
- docs(changelog): add filter for org switcher · 28ac05b1
```
closes #2609
```
  bergquist committed Aug 18, 2016
  28ac05b1 Browse Files
- Merge branch 'Othyus-filter_orgs' · 6d60d125
  bergquist committed Aug 18, 2016
  
  6d60d125 Browse Files
- Merge branch 'filter_orgs' of https://github.com/Othyus/grafana into Othyus-filter_orgs · e3bbf96b
  bergquist committed Aug 18, 2016
  
  e3bbf96b Browse Files
- Update aws-sdk from v1.0.0 to v1.4.1, fixes #5763. (#5813) · 998ed097
  beejeebus committed Aug 18, 2016
  
  998ed097 Browse Files
- Align step with interval passed to Prometheus query using rate() (#5839) · d086f5d3
  Roman Vynar committed Aug 18, 2016
  
  d086f5d3 Browse Files
17 Aug, 2016 5 commits
- Merge branch 'v3.1.x' · 6fae5a3b
  Torkel Ödegaard committed Aug 17, 2016
  
  6fae5a3b Browse Files
- fix(metrics): restored prefix default to prod.grafana.. · 093563ac
  Torkel Ödegaard committed Aug 17, 2016
  
  093563ac Browse Files
- Merge branch 'v3.1.x' · f9b628ad
```
Conflicts:
	conf/defaults.ini
	conf/sample.ini
	pkg/metrics/graphite.go
	pkg/metrics/graphite_test.go
```
  Torkel Ödegaard committed Aug 17, 2016
  f9b628ad Browse Files
- Merge branch 'master' of github.com:grafana/grafana · 2b2b6486
  Torkel Ödegaard committed Aug 17, 2016
  
  2b2b6486 Browse Files
- fix(OpenTSDB): correct content-type, fixes #4965 · 159ea69e
  Torkel Ödegaard committed Aug 17, 2016
  
  159ea69e Browse Files
16 Aug, 2016 3 commits
- Merge branch 'v3.1.x' of github.com:grafana/grafana into v3.1.x · 0951da9c
  Torkel Ödegaard committed Aug 16, 2016
  
  0951da9c Browse Files
- feat(inspector): fixed error handling, showing response body when data proxy returns text/html body · a5f0f508
  Torkel Ödegaard committed Aug 16, 2016
  
  a5f0f508 Browse Files
- tech(docker): add default db for postgres · de714e33
  bergquist committed Aug 16, 2016
  
  de714e33 Browse Files
15 Aug, 2016 12 commits
- InfluxDB data source: Removed 'required' attribute from User/Password (#5820) · 08932b8e
  Claudius Zingerli committed Aug 15, 2016
  
  08932b8e Browse Files
- tech(circle): rearrange build order · 31952098
  bergquist committed Aug 15, 2016
  
  31952098 Browse Files
- feat(metrics): improve graphite settings · f7a91025
```
Fixes the broken support for overriding settings with ENV variables.
closes #5769
```
  bergquist committed Aug 15, 2016
  f7a91025 Browse Files
- fix(metrics): add ending dot for graphite prefix · cf6736d4
  bergquist committed Aug 15, 2016
  
  cf6736d4 Browse Files
- fix(metrics): hide none existing metrics settings · 41790c67
  bergquist committed Aug 15, 2016
  
  41790c67 Browse Files
- fix(metrics): make metrics cfg backwards compatible · ebecc5e5
  bergquist committed Aug 15, 2016
  
  ebecc5e5 Browse Files
- feat(metrics): minor fix for internal metrics fix PR #5758 · 2c1b893c
  Torkel Ödegaard committed Aug 15, 2016
  
  2c1b893c Browse Files
- fix(metrics): replaces . with _ in instance name · 0524d0c6
```
closes #5739
```
  bergquist committed Aug 15, 2016
  0524d0c6 Browse Files
- feat(cli): add default plugin folder for MAC OS · 2b2e015d
```
closes #5806
```
  bergquist committed Aug 15, 2016
  2b2e015d Browse Files
- Update CHANGELOG.md · cd9bd5be
  Torkel Ödegaard committed Aug 15, 2016
  
  cd9bd5be Browse Files
- docs(changelog): add note about fixing #5806 · 7ce13ef0
  bergquist committed Aug 15, 2016
  
  7ce13ef0 Browse Files
- feat(cli): add default plugin folder for MAC OS · 7a913f77
```
closes #5806
```
  bergquist committed Aug 15, 2016
  7a913f77 Browse Files
14 Aug, 2016 9 commits
- Merge branch 'v3.1.x' · 0ea3458f
```
Conflicts:
	public/app/features/dashboard/dynamic_dashboard_srv.ts
```
  Torkel Ödegaard committed Aug 14, 2016
  0ea3458f Browse Files
- fix(templating): another fix for repeating panels and having old panels/scoped… · 58df60f6
```
fix(templating): another fix for repeating panels and having old panels/scoped vars stuck after switching repeat variable, fixes #5795
```
  Torkel Ödegaard committed Aug 14, 2016
  58df60f6 Browse Files
- fix repeat panels (#5796) · cbf0e77a
  Julian Einwag committed Aug 14, 2016
  
  cbf0e77a Browse Files
- docs(): updated docs · 1eca0d7c
  Torkel Ödegaard committed Aug 14, 2016
  
  1eca0d7c Browse Files
- Merge branch 'master' of github.com:grafana/grafana · 76e4b7ce
  Torkel Ödegaard committed Aug 14, 2016
  
  76e4b7ce Browse Files
- fix repeat panels (#5796) · deb245f5
  Julian Einwag committed Aug 14, 2016
  
  deb245f5 Browse Files
- (cloudwatch) support ApplicationELB (#5802) · 7a1011ac
  Mitsuhiro Tanda committed Aug 14, 2016
  
  7a1011ac Browse Files
- Merge branch 'master' of github.com:grafana/grafana · 8499d32d
  Torkel Ödegaard committed Aug 14, 2016
  
  8499d32d Browse Files
- fix(graph): fixed issue with tooltip introduced in recent commit · d894c137
  Torkel Ödegaard committed Aug 14, 2016
  
  d894c137 Browse Files
13 Aug, 2016 2 commits
- Merge pull request #5809 from kou/patch-1 · a530df84
```
Update the number of ways
```
  Carl Bergquist committed Aug 13, 2016
  a530df84 Browse Files
- Update the number of ways · 46630df8
  Kouhei Sutou committed Aug 13, 2016
  
  46630df8 Browse Files
12 Aug, 2016 1 commit
- fix(metrics): add ending dot for graphite prefix · 2fa97427
  bergquist committed Aug 12, 2016
  
  2fa97427 Browse Files
11 Aug, 2016 2 commits
- fix(metrics): hide none existing metrics settings · f07b2ac4
  bergquist committed Aug 11, 2016
  
  f07b2ac4 Browse Files
- Merge branch 'v3.1.x' · da6ac07b
  Torkel Ödegaard committed Aug 11, 2016
  
  da6ac07b Browse Files