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

09 Mar, 2016 5 commits
- Merge pull request #4296 from knowroozi/opentsdb_annotations · ac439d83
```
add annotations for opentsdb
```
  Carl Bergquist committed Mar 09, 2016
  ac439d83 Browse Files
- fix(jshint): fixed jshint warning · c0b92eb5
  Torkel Ödegaard committed Mar 09, 2016
  
  c0b92eb5 Browse Files
- Merge branch 'master' of github.com:grafana/grafana · 5599bdf1
  Torkel Ödegaard committed Mar 09, 2016
  
  5599bdf1 Browse Files
- fix(share): fixed checkboxes in share modal, fixes #4301 · de415360
  Torkel Ödegaard committed Mar 09, 2016
  
  de415360 Browse Files
- Merge pull request #4295 from utkarshcmu/nav-fix · 30d32199
```
Minor nav fix
```
  Torkel Ödegaard committed Mar 09, 2016
  30d32199 Browse Files
08 Mar, 2016 35 commits
- example(plugin.json): add example dashboard file · 59a02ce7
  bergquist committed Mar 08, 2016
  
  59a02ce7 Browse Files
- example(plugin.json): align example app with latests version · 2c396d49
  bergquist committed Mar 08, 2016
  
  2c396d49 Browse Files
- Merge branch 'master' of github.com:grafana/grafana · 7ecf0579
  Torkel Ödegaard committed Mar 08, 2016
  
  7ecf0579 Browse Files
- feat(plugins): commented out dashboard import list · 091726b3
  Torkel Ödegaard committed Mar 08, 2016
  
  091726b3 Browse Files
- feat(plugins): a lot of work on #4298 · dfaa6d8e
  Torkel Ödegaard committed Mar 08, 2016
  
  dfaa6d8e Browse Files
- example(plugin.json): add dashboards array in includes · ae3bda81
  bergquist committed Mar 08, 2016
  
  ae3bda81 Browse Files
- examples(plugin.json): add includes info · 0ec74763
  bergquist committed Mar 08, 2016
  
  0ec74763 Browse Files
- add annotations for opentsdb · 945131cc
  Kaveh Nowroozi committed Mar 08, 2016
  
  945131cc Browse Files
- Minor nav fix · 92c60253
  utkarshcmu committed Mar 08, 2016
  
  92c60253 Browse Files
- Merge pull request #4294 from utkarshcmu/docs-fix · 138c738d
```
Fixed some typos in docs
```
  Carl Bergquist committed Mar 08, 2016
  138c738d Browse Files
- Fixed some typos · 4fae1958
  utkarshcmu committed Mar 08, 2016
  
  4fae1958 Browse Files
- docs(github): move markdown files into .github folder · fb450385
  bergquist committed Mar 08, 2016
  
  fb450385 Browse Files
- Merge branch 'master' into dashboard-thing · 7b1d8274
```
Conflicts:
	public/app/features/datasources/partials/edit.html
```
  Torkel Ödegaard committed Mar 08, 2016
  7b1d8274 Browse Files
- Merge branch 'master' of github.com:grafana/grafana · 74ebc2d3
  Torkel Ödegaard committed Mar 08, 2016
  
  74ebc2d3 Browse Files
- feat(cli): use commandline object all the way · 95f3e520
  bergquist committed Mar 08, 2016
  
  95f3e520 Browse Files
- feat(editorconfig): add config for go files · da2b65cd
  bergquist committed Mar 08, 2016
  
  da2b65cd Browse Files
- style(cli): fixed typos · 2fcb8b84
  bergquist committed Mar 08, 2016
  
  2fcb8b84 Browse Files
- gofmt · d7a72e30
  bergquist committed Mar 08, 2016
  
  d7a72e30 Browse Files
- fix(cli): retry download when panicing · f397d0dd
```
Will retry to download plugins once if the zip lib panics.

closes #4068
```
  bergquist committed Mar 08, 2016
  f397d0dd Browse Files
- feat(plugins): progress on plugins page · db986320
  Torkel Ödegaard committed Mar 08, 2016
  
  db986320 Browse Files
- Merge pull request #4291 from utkarshcmu/ds-api · 1509b4cb
```
Pulled out the common code
```
  Torkel Ödegaard committed Mar 08, 2016
  1509b4cb Browse Files
- Pulled out the common code · f20f4d13
  utkarshcmu committed Mar 08, 2016
  
  f20f4d13 Browse Files
- Merge pull request #4287 from grafana/raintank-issue4283 · 3af4b1ff
```
refactor how template vars are updated. fixes #4283
```
  Torkel Ödegaard committed Mar 08, 2016
  3af4b1ff Browse Files
- feat(plugins): remove app bundled plugins from plugins list · f80c2406
  Torkel Ödegaard committed Mar 08, 2016
  
  f80c2406 Browse Files
- Merge pull request #4290 from utkarshcmu/utkarshcmu-api-docs · 17006b45
```
Update data_source.md
```
  Carl Bergquist committed Mar 08, 2016
  17006b45 Browse Files
- Update data_source.md · e5d400eb
  Utkarsh Bhatnagar committed Mar 08, 2016
  
  e5d400eb Browse Files
- Merge pull request #4279 from utkarshcmu/ds-api · f824004e
```
Implemented GetDataSourceByName API
```
  Carl Bergquist committed Mar 08, 2016
  f824004e Browse Files
- style(graph): convert query options to gf-form · 453eebba
  bergquist committed Mar 08, 2016
  
  453eebba Browse Files
- Implemented GetDataSourceByName API · 1a39d93b
  utkarshcmu committed Mar 08, 2016
  
  1a39d93b Browse Files
- feat(templating): fixed failing unit tests in PR #4287 · 6fac4714
  Torkel Ödegaard committed Mar 08, 2016
  
  6fac4714 Browse Files
- fix(graph): type in html · 252568c9
  bergquist committed Mar 08, 2016
  
  252568c9 Browse Files
- feat(graph): add spacing above Series specific overrides · 8e11f8dc
  bergquist committed Mar 08, 2016
  
  8e11f8dc Browse Files
- fix(templaing): refactoring PR #4283 · 2475ca8f
  Torkel Ödegaard committed Mar 08, 2016
  
  2475ca8f Browse Files
- docs(plugin): add table reponse format for queries · 2a18430a
  bergquist committed Mar 08, 2016
  
  2a18430a Browse Files
- ensure current template variable is set. · dc4743a3
```
- When distributing a dashboard it is often not practical to have
"current" template variable option set. This commit ensures that
for dashboards with no current, it is assigned when the dashboard
loads (assuming refresh on load is set.)
```
  woodsaj committed Mar 08, 2016
  dc4743a3 Browse Files