Commits · 16cd27282fa221121e36989417762c688f3e75b1 · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

11 Jan, 2016 6 commits
- Merge pull request #3686 from keis/phantomjs-dependency · 16cd2728
```
Add missing peer dependency: phantomjs
```
  Torkel Ödegaard committed Jan 11, 2016
  16cd2728 Browse Files
- changelog: updated with info about #3635 · 882980ad
  Torkel Ödegaard committed Jan 11, 2016
  
  882980ad Browse Files
- Merge branch 'snapshot_annotation' of https://github.com/mtanda/grafana into… · 66f7a2be
```
Merge branch 'snapshot_annotation' of https://github.com/mtanda/grafana into mtanda-snapshot_annotation
```
  Torkel Ödegaard committed Jan 11, 2016
  66f7a2be Browse Files
- Merge pull request #3681 from byronmwong/master · 908b2d15
```
Fix elasticsearch hourly indexes
```
  Torkel Ödegaard committed Jan 11, 2016
  908b2d15 Browse Files
- annotation snapshot fix · d3bc5227
  Mitsuhiro Tanda committed Jan 11, 2016
  
  d3bc5227 Browse Files
- snapshot annotation · 012d1378
  Mitsuhiro Tanda committed Jan 11, 2016
  
  012d1378 Browse Files
08 Jan, 2016 13 commits
- Merge branch 'master' of github.com:grafana/grafana · a9aaa5ad
  Torkel Ödegaard committed Jan 08, 2016
  
  a9aaa5ad Browse Files
- feat(sidemenu): improved user dropdown and sidemenu, will be improved further, #3687 · 6c1fee73
  Torkel Ödegaard committed Jan 08, 2016
  
  6c1fee73 Browse Files
- Merge branch 'sidebar-consolidation' of github.com:nchristus/grafana into sidebar-consolidation · f81d2595
  Torkel Ödegaard committed Jan 08, 2016
  
  f81d2595 Browse Files
- Add missing peer dependency: phantomjs · 1896bd09
  David Keijser committed Jan 08, 2016
  
  1896bd09 Browse Files
- Merge pull request #3683 from mtanda/cloudwatch_reuse_credentials · 183f3239
```
(cloudwatch) reuse credentials
```
  Torkel Ödegaard committed Jan 08, 2016
  183f3239 Browse Files
- docs(plugins): fixes typo · d0841919
  bergquist committed Jan 08, 2016
  
  d0841919 Browse Files
- docs(plugins): adds plugin page · a23e60ab
  bergquist committed Jan 08, 2016
  
  a23e60ab Browse Files
- Merge pull request #3679 from volter/colored-bolt · ab30297d
```
Color the annotation bolt (#3590)

closes #3590 
```
  Carl Bergquist committed Jan 08, 2016
  ab30297d Browse Files
- Merge branch 'docs-2.6' · 3362d6bc
  Torkel Ödegaard committed Jan 08, 2016
  
  3362d6bc Browse Files
- docs: minor change to docs make file · e5f391ab
  Torkel Ödegaard committed Jan 08, 2016
  
  e5f391ab Browse Files
- docs: fixed building from source go dependency verison · 19a5e425
  Torkel Ödegaard committed Jan 08, 2016
  
  19a5e425 Browse Files
- (cloudwatch) reuse credentials · f84737d7
  Mitsuhiro Tanda committed Jan 08, 2016
  
  f84737d7 Browse Files
- sidebar-consolidation: added new org menu to sidebar · 0ee0ea55
  Nick Christus committed Jan 07, 2016
  
  0ee0ea55 Browse Files
07 Jan, 2016 12 commits
- Fix elasticsearch hourly indexes · 40845578
  Byron committed Jan 07, 2016
  
  40845578 Browse Files
- Color the annotation bolt (#3590) · f4e22e49
```
Makes it easier to distinguish between annotations while
editing and using them; Uses the icon color.
```
  Volker Fröhlich committed Jan 07, 2016
  f4e22e49 Browse Files
- Merge branch 'v2.6.x' · 8a2af9b8
  Torkel Ödegaard committed Jan 07, 2016
  
  8a2af9b8 Browse Files
- fix(graph panel): fixed bug in typeahead when adding series style override, fixes #3554 · 255901ca
  Torkel Ödegaard committed Jan 07, 2016
  
  255901ca Browse Files
- fix(timepicker): fixed recent breaking of datetime picker when swithing from requirejs to systemjs · 52644bb2
  Torkel Ödegaard committed Jan 07, 2016
  
  52644bb2 Browse Files
- Merge branch 'hcooper-hover-order' · 7cad3c89
  bergquist committed Jan 07, 2016
  
  7cad3c89 Browse Files
- style(tooltip): removed comment and extrated sort · bcdddfe4
  bergquist committed Jan 07, 2016
  
  bcdddfe4 Browse Files
- Merge branch 'hover-order' of https://github.com/hcooper/grafana into hcooper-hover-order · c4ca1444
  bergquist committed Jan 07, 2016
  
  c4ca1444 Browse Files
- docs(changelog): add note about ssl support for mysql · f5565d48
  bergquist committed Jan 07, 2016
  
  f5565d48 Browse Files
- Merge branch 'improbable-io-ssl-for-mysql' · f20ee6b4
  bergquist committed Jan 07, 2016
  
  f20ee6b4 Browse Files
- Merge branch 'ssl-for-mysql' of https://github.com/improbable-io/grafana into… · 6c8d0846
```
Merge branch 'ssl-for-mysql' of https://github.com/improbable-io/grafana into improbable-io-ssl-for-mysql
```
  bergquist committed Jan 07, 2016
  6c8d0846 Browse Files
- fix(plugins): removes warnings for missing folder · 5792a162
```
Remove warnings when scanning for plugins in the default
catalog data/plugins

closes #3663
```
  bergquist committed Jan 07, 2016
  5792a162 Browse Files
06 Jan, 2016 1 commit
- feat(plugins): adds warn log for scanning folders · 9343b037
```
symlinks outside to plugin folder can cause problems.
This commit makes sure to warn about it in the logs
```
  bergquist committed Jan 06, 2016
  9343b037 Browse Files
05 Jan, 2016 3 commits
- feat(singlestat): make sparkline height dynamic · 5de69b28
```
closes #3553
```
  bergquist committed Jan 05, 2016
  5de69b28 Browse Files
- Merge pull request #3636 from henridf/docs-es-filter-in-template · 5c0812ab
```
Docs: add example with filter in ES template
```
  Carl Bergquist committed Jan 05, 2016
  5c0812ab Browse Files
- Docs: add example with filter in ES template · 5af3fe93
  Henri DF committed Jan 04, 2016
  
  5af3fe93 Browse Files
04 Jan, 2016 2 commits
- Merge pull request #3624 from mtanda/prometheus_link_fix · 09b84013
```
(prometheus) fix Prometheus link
```
  Carl Bergquist committed Jan 04, 2016
  09b84013 Browse Files
- Merge pull request #3626 from aqnouch/patch-1 · 03c10ef8
```
Updated copyright to 2016
```
  Carl Bergquist committed Jan 04, 2016
  03c10ef8 Browse Files
01 Jan, 2016 1 commit
- Updated copyright to 2016 · cc1ed98f
  AQNOUCH Mohammed committed Jan 01, 2016
  
  cc1ed98f Browse Files
31 Dec, 2015 2 commits
- fix end time of Prometheus link · ebf0bd5f
  Mitsuhiro Tanda committed Dec 31, 2015
  
  ebf0bd5f Browse Files
- fix Prometheus link, expand template variable in expression · be48caf5
  Mitsuhiro Tanda committed Dec 31, 2015
  
  be48caf5 Browse Files