Commits · 38f4cfb7a28464fda1ca2c791f68ceaf265f78cd · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

14 Dec, 2015 18 commits
- Merge branch 'v2.6.x' · 38f4cfb7
  Torkel Ödegaard committed Dec 14, 2015
  
  38f4cfb7 Browse Files
- feat(elasticsearch): added unit option to derivative metric, closes #3512 · aca9d396
  Torkel Ödegaard committed Dec 14, 2015
  
  aca9d396 Browse Files
- Merge branch 'master' of github.com:grafana/grafana · 4cc06ad7
  Torkel Ödegaard committed Dec 14, 2015
  
  4cc06ad7 Browse Files
- fix(graphite): minor fix to graphite query editor so it does not issue render… · 79d56f77
```
fix(graphite): minor fix to graphite query editor so it does not issue render requests for incomplete queries, fixes #3510
```
  Torkel Ödegaard committed Dec 14, 2015
  79d56f77 Browse Files
- Merge pull request #2949 from shoonoise/master · 280f9bef
```
Add option to hide raintank share button

Fixes #2727
```
  Carl Bergquist committed Dec 14, 2015
  280f9bef Browse Files
- style(sidemenu): rename signup method to signout · 1cfa523f
  carl bergquist committed Dec 14, 2015
  
  1cfa523f Browse Files
- Merge pull request #3122 from shoonoise/hide_signout · 548ee47a
```
Disable sign out button in case of auth proxy enabled
```
  Carl Bergquist committed Dec 14, 2015
  548ee47a Browse Files
- updated master version to 3.0.0-pre1 · 55448de9
  Torkel Ödegaard committed Dec 14, 2015
  
  55448de9 Browse Files
- fix(windows): exclude syslog feature from windows builds · b63471eb
  Torkel Ödegaard committed Dec 14, 2015
  
  b63471eb Browse Files
- docs(): updated downloads for 2.6 and whats new in 2.6 article · 33395d53
  Torkel Ödegaard committed Dec 14, 2015
  
  33395d53 Browse Files
- updated version to 2.6.0 · fcd3af30
  Torkel Ödegaard committed Dec 14, 2015
  
  fcd3af30 Browse Files
- docs(): added whats new in 2.6 article · e334107c
  Torkel Ödegaard committed Dec 14, 2015
  
  e334107c Browse Files
- feat(elasticsearch): only show pipeline agg for es version >= 2 · f5eb54e5
  carl bergquist committed Dec 14, 2015
  
  f5eb54e5 Browse Files
- docs(influxdb): updated influxdb docs · 56c3dd36
  Torkel Ödegaard committed Dec 14, 2015
  
  56c3dd36 Browse Files
- docs(elasticsearch): updated elasticsearch with info about templating and pipeline metrics · 6ddd4584
  Torkel Ödegaard committed Dec 14, 2015
  
  6ddd4584 Browse Files
- docs(table): updated table docs · ee328667
  Torkel Ödegaard committed Dec 14, 2015
  
  ee328667 Browse Files
- Merge pull request #3502 from mattttt/table-panel-doc · 3dee7560
```
New table panel doc
```
  Torkel Ödegaard committed Dec 14, 2015
  3dee7560 Browse Files
- fix(postgres): fixes db migration issue with_credentials column for postgres, fixes #3505 · c7e3ed09
  Torkel Ödegaard committed Dec 14, 2015
  
  c7e3ed09 Browse Files
11 Dec, 2015 22 commits
- New table panel doc · 62fe5cdb
  Matt Toback committed Dec 11, 2015
  
  62fe5cdb Browse Files
- feat(elasticsearch): adds support for inline script and missing options to all… · 10f66fa7
```
feat(elasticsearch): adds support for inline script and missing options to all elasticsearch metrics, closes #3500
```
  Torkel Ödegaard committed Dec 11, 2015
  10f66fa7 Browse Files
- Merge pull request #3499 from discordianfish/clarify-template-auto-interval-tooltip · 0cbc4931
```
Clarify template option auto interval in tooltip
```
  Torkel Ödegaard committed Dec 11, 2015
  0cbc4931 Browse Files
- Clarify template option auto interval in tooltip · c30c9fbc
  Johannes 'fish' Ziemke committed Dec 11, 2015
  
  c30c9fbc Browse Files
- feat(changelog): adds info about merge PR · f4fd3f48
  carl bergquist committed Dec 11, 2015
  
  f4fd3f48 Browse Files
- Merge pull request #3405 from piotr1212/master · 4ee9e48e
```
Add more info in route logging
```
  Carl Bergquist committed Dec 11, 2015
  4ee9e48e Browse Files
- Merge pull request #3393 from pepl/master · 55fab049
```
Fixed spelling error
```
  Carl Bergquist committed Dec 11, 2015
  55fab049 Browse Files
- Merge remote-tracking branch 'upstream/master' · 22c4e605
  carl bergquist committed Dec 11, 2015
  
  22c4e605 Browse Files
- feat(changelog): add info about merge PR to changelog · 67737b15
  carl bergquist committed Dec 11, 2015
  
  67737b15 Browse Files
- Merge branch 'tmonk42-ldap_login_hints' · cdfd3449
  carl bergquist committed Dec 11, 2015
  
  cdfd3449 Browse Files
- Merge branch 'ldap_login_hints' of https://github.com/tmonk42/grafana into tmonk42-ldap_login_hints · fab1062c
```
Conflicts:
	conf/defaults.ini
	pkg/setting/setting.go

closes #2571
closes #2494
```
  carl bergquist committed Dec 11, 2015
  fab1062c Browse Files
- Merge branch 'master' of github.com:grafana/grafana · 766b9d52
  Torkel Ödegaard committed Dec 11, 2015
  
  766b9d52 Browse Files
- fix(influxdb): minor fix to new editor, there were 5min as a selectable option… · 023fa2b2
```
fix(influxdb): minor fix to new editor, there were 5min as a selectable option in derivative function
```
  Torkel Ödegaard committed Dec 11, 2015
  023fa2b2 Browse Files
- fix(changelog): add info about merged PR's · 8910351f
  carl bergquist committed Dec 11, 2015
  
  8910351f Browse Files
- fix(timepicker): mini change, removed unneeded space · 1b42e301
  Torkel Ödegaard committed Dec 11, 2015
  
  1b42e301 Browse Files
- Merge pull request #3498 from bergquist/always_show_refresh_button · 4e9e18d4
```
feat(timepicker): always show refresh button
```
  Torkel Ödegaard committed Dec 11, 2015
  4e9e18d4 Browse Files
- feat(timepicker): always show refresh button · ba5b1276
```
closes #1628
closes #1208
```
  carl bergquist committed Dec 11, 2015
  ba5b1276 Browse Files
- Merge pull request #3161 from mischief/syslog · 225e7a6a
```
syslog support closes #3160 
```
  Carl Bergquist committed Dec 11, 2015
  225e7a6a Browse Files
- fix(elasticsearch): minor markup fix · 7e9963ae
  Torkel Ödegaard committed Dec 11, 2015
  
  7e9963ae Browse Files
- Merge branch 'master' of github.com:grafana/grafana · b7c0f3ea
  Torkel Ödegaard committed Dec 11, 2015
  
  b7c0f3ea Browse Files
- updated changelog · a8e2610d
  Torkel Ödegaard committed Dec 11, 2015
  
  a8e2610d Browse Files
- Merge branch 'moving_avg_es_support' · b934ace1
  Torkel Ödegaard committed Dec 11, 2015
  
  b934ace1 Browse Files