Commits · 55fab0493dc15b65367cf3b60b166461af031488 · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

11 Dec, 2015 29 commits
- 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
- feat(elasticsearch): added pipeline aggregations feature to changelog · 82cbfc99
  Torkel Ödegaard committed Dec 11, 2015
  
  82cbfc99 Browse Files
- feat(elasticsearch): completed initial implementation of moving average and… · 9f294e35
```
feat(elasticsearch): completed initial implementation of moving average and derivative pipleline aggregations, closes #3451
```
  Torkel Ödegaard committed Dec 11, 2015
  9f294e35 Browse Files
- Merge pull request #3494 from mtanda/cloudwatch_cleanup · 68775182
```
remove aws-sdk-js require setting
```
  Torkel Ödegaard committed Dec 11, 2015
  68775182 Browse Files
- remove aws-sdk-js require setting · dc3e172e
  Mitsuhiro Tanda committed Dec 11, 2015
  
  dc3e172e Browse Files
- Merge pull request #3493 from bergquist/table_panel_color_invert_order · 5bd128ba
```
Table Panel: adds invert color order functionality
```
  Torkel Ödegaard committed Dec 11, 2015
  5bd128ba Browse Files
- feat(table_panel): adds invert color order functionality · 1a8579cd
  carl bergquist committed Dec 11, 2015
  
  1a8579cd Browse Files
- Merge pull request #3490 from mtanda/cloudwatch_metric_update · 5921bb05
```
(cloudwatch) update suggest metrics and dimensions
```
  Torkel Ödegaard committed Dec 11, 2015
  5921bb05 Browse Files
- sort metrics and dimensions · c8e894e8
  Mitsuhiro Tanda committed Dec 11, 2015
  
  c8e894e8 Browse Files
- feat(elasticsearch): display more info in options · 141f22be
  carl bergquist committed Dec 11, 2015
  
  141f22be Browse Files
- update supported metrics and dimensions · d9844350
  Mitsuhiro Tanda committed Dec 11, 2015
  
  d9844350 Browse Files
- reorder supported metrics and dimensions · 2d9d11a8
  Mitsuhiro Tanda committed Dec 11, 2015
  
  2d9d11a8 Browse Files
- feat(elasticsearch): add support for model setting · 4fa92198
  carl bergquist committed Dec 11, 2015
  
  4fa92198 Browse Files
- feat(elasticsearch): adds last class for derivatives · 662430d5
  carl bergquist committed Dec 11, 2015
  
  662430d5 Browse Files
10 Dec, 2015 11 commits
- feat(elasticsearch): make series naming generic for pipeline aggs · 139b19f9
  carl bergquist committed Dec 10, 2015
  
  139b19f9 Browse Files
- feat(elasticsearch): remove pipeline aggs as possible sources · 6e50e241
  carl bergquist committed Dec 10, 2015
  
  6e50e241 Browse Files
- refactor(elasticsearch): mavg naming -> pipeline agg · 005e14a0
  carl bergquist committed Dec 10, 2015
  
  005e14a0 Browse Files
- feat(elasticsearch): improve pipeline aggs structure · c8c9e0a7
  carl bergquist committed Dec 10, 2015
  
  c8c9e0a7 Browse Files
- feat(elasticsearch): update pipeline aggs if type change · 0f65cb2b
```
make it possible to switch between different pipeline
aggregates without causing problms in the ui
```
  carl bergquist committed Dec 10, 2015
  0f65cb2b Browse Files
- feat(elasticsearch): add pipeline settings · 85094fc7
  Carl Bergquist committed Dec 10, 2015
  
  85094fc7 Browse Files
- fix(invite): removed resend invite button, button logic was not implemented, fixes #3484 · 5227dc67
  Torkel Ödegaard committed Dec 10, 2015
  
  5227dc67 Browse Files
- fix(graph legend): fixed issue with escaping html text in graph legend, and in… · 77c510c3
```
fix(graph legend): fixed issue with escaping html text in graph legend, and in function param, fixes #3482
```
  Torkel Ödegaard committed Dec 10, 2015
  77c510c3 Browse Files
- show pipeline agg source for derivative · 2d2ad8b2
  Carl Bergquist committed Dec 10, 2015
  
  2d2ad8b2 Browse Files
- fix(timpicker): another name change to make quick ranges nameing more consistent, fixes #3465 · 6ea00a4f
  Torkel Ödegaard committed Dec 10, 2015
  
  6ea00a4f Browse Files
- feat(elasticsearch): metric options alignement · 1bb0530c
  Torkel Ödegaard committed Dec 10, 2015
  
  1bb0530c Browse Files