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

18 Dec, 2015 2 commits
- Merged with master, resolved conflicts · c4331679
  utkarshcmu committed Dec 18, 2015
  
  c4331679 Browse Files
- Added UI , DB settings · e0ffcda3
  utkarshcmu committed Dec 18, 2015
  
  e0ffcda3 Browse Files
17 Dec, 2015 8 commits
- Merge branch 'felixbarny-global_interval' · 28e7f0f7
  carl bergquist committed Dec 17, 2015
  
  28e7f0f7 Browse Files
- feat(elasticsearch): move default query parameters to new table · 80d757b3
  carl bergquist committed Dec 17, 2015
  
  80d757b3 Browse Files
- Merge branch 'global_interval' of https://github.com/felixbarny/grafana into… · 5bdf0cd1
```
Merge branch 'global_interval' of https://github.com/felixbarny/grafana into felixbarny-global_interval

Conflicts:
	public/app/plugins/datasource/elasticsearch/partials/config.html
```
  carl bergquist committed Dec 17, 2015
  5bdf0cd1 Browse Files
- fix(elastic): fixed typo · e4985034
  carl bergquist committed Dec 17, 2015
  
  e4985034 Browse Files
- fix(settings): make headline more informative · 26f70a5f
  carl bergquist committed Dec 17, 2015
  
  26f70a5f Browse Files
- Merge pull request #3133 from tdyas/add_pencil_to_graphite_ds · ef46b232
```
add pencil icon back to graphite data source
```
  Carl Bergquist committed Dec 17, 2015
  ef46b232 Browse Files
- Merge branch 'addshore-graphiteSortByNameNatural' · 39ccf152
  carl bergquist committed Dec 17, 2015
  
  39ccf152 Browse Files
- feat(graphite): make sortByName optional · 12889a95
```
fixes #3360
closes #3361
```
  carl bergquist committed Dec 17, 2015
  12889a95 Browse Files
16 Dec, 2015 16 commits
- Merge branch 'utkarshcmu-relative' · 3693473f
  carl bergquist committed Dec 16, 2015
  
  3693473f Browse Files
- style(graph.tooltip): moves checkdate logic inside each method. · 2cb83cf1
```
I find it easier to follow and checkdate didnt do much.
```
  carl bergquist committed Dec 16, 2015
  2cb83cf1 Browse Files
- Merge branch 'relative' of https://github.com/utkarshcmu/grafana into utkarshcmu-relative · 8c02a7bd
  carl bergquist committed Dec 16, 2015
  
  8c02a7bd Browse Files
- Merge pull request #3307 from dennisdegreef/addCubicMeters · 8ee0e5d1
```
Add cubic meters to units
```
  Carl Bergquist committed Dec 16, 2015
  8ee0e5d1 Browse Files
- Merge pull request #3542 from grafana/revert-3445-cloudwatch_sum_period · c87b4256
```
Revert "(cloudwatch) add "Divide Sum By Period" option"
```
  Carl Bergquist committed Dec 16, 2015
  c87b4256 Browse Files
- Revert "(cloudwatch) add "Divide Sum By Period" option" · e320bd02
  Carl Bergquist committed Dec 16, 2015
  
  e320bd02 Browse Files
- Merge pull request #3445 from mtanda/cloudwatch_sum_period · d465c445
```
(cloudwatch) add "Divide Sum By Period" option
```
  Carl Bergquist committed Dec 16, 2015
  d465c445 Browse Files
- Removed NewAddColumnMigration via 3473 · 78fe5883
  utkarshcmu committed Dec 16, 2015
  
  78fe5883 Browse Files
- Merge pull request #3535 from utkarshcmu/typos · ddf72fa5
```
Fixed typos
```
  Torkel Ödegaard committed Dec 16, 2015
  ddf72fa5 Browse Files
- Fixed typos · 3a6e8a53
  utkarshcmu committed Dec 16, 2015
  
  3a6e8a53 Browse Files
- feat(graphite): adds support for grep function · 48539c85
```
closes #1163
```
  carl bergquist committed Dec 16, 2015
  48539c85 Browse Files
- Merge branch 'jmaitrehenry-feature/symlinks' · a701bba8
  carl bergquist committed Dec 16, 2015
  
  a701bba8 Browse Files
- (cloudwatch) add Divide By Sum option · c7ba6016
  Mitsuhiro Tanda committed Dec 16, 2015
  
  c7ba6016 Browse Files
- Merge branch 'feature/symlinks' of https://github.com/jmaitrehenry/grafana into… · d4e98cd9
```
Merge branch 'feature/symlinks' of https://github.com/jmaitrehenry/grafana into jmaitrehenry-feature/symlinks

Conflicts:
	pkg/plugins/plugins.go

closes #2899
closes #2834
```
  carl bergquist committed Dec 16, 2015
  d4e98cd9 Browse Files
- Merge pull request #3531 from mtanda/cloudwatch_fix_annotation · 05ec24e7
```
(cloudwatch) fix query editor
```
  Torkel Ödegaard committed Dec 16, 2015
  05ec24e7 Browse Files
- fix cloudwatch query editor · e44ef7f8
  Mitsuhiro Tanda committed Dec 16, 2015
  
  e44ef7f8 Browse Files
15 Dec, 2015 14 commits
- Merge pull request #3304 from utkarshcmu/info · 2b58b6b5
```
Added metadata info panel
```
  Carl Bergquist committed Dec 15, 2015
  2b58b6b5 Browse Files
- Merge branch 'stesie-fix-formatter-stack-percentage' · 3868a796
  carl bergquist committed Dec 15, 2015
  
  3868a796 Browse Files
- test(graph): validates that percentage is shown when using stack and percentage · b99ea80b
```
fixes #2379
```
  carl bergquist committed Dec 15, 2015
  b99ea80b Browse Files
- Use percent-formatter for stack+percentage graph · ce2ae319
  Stefan Siegl committed Dec 15, 2015
  
  ce2ae319 Browse Files
- rename(phantomjs): improve variable naming · f355f36d
  carl bergquist committed Dec 15, 2015
  
  f355f36d Browse Files
- Merge pull request #3400 from counsyl/wait-for-dashboard-render · 5aa11b45
```
Wait for all panels to render in PhantomJS
```
  Carl Bergquist committed Dec 15, 2015
  5aa11b45 Browse Files
- fix(tests): fix broken unittest due to merge conflict · c48da9b5
  carl bergquist committed Dec 15, 2015
  
  c48da9b5 Browse Files
- Merge branch 'xaka-patch-2' · 12d65bfd
  carl bergquist committed Dec 15, 2015
  
  12d65bfd Browse Files
- ui(dashboard): delete empty rows without confirm · cba471b0
  Pavel Strashkin committed Dec 15, 2015
  
  cba471b0 Browse Files
- change(cloudwatch): minor change to editor · f1b897b3
  Torkel Ödegaard committed Dec 15, 2015
  
  f1b897b3 Browse Files
- Merge branch 'master' of github.com:grafana/grafana · 05891340
  Torkel Ödegaard committed Dec 15, 2015
  
  05891340 Browse Files
- fix(unit tests): moved kairosdb spec to it's plugin repo · 6ed36e01
  Torkel Ödegaard committed Dec 15, 2015
  
  6ed36e01 Browse Files
- Merge pull request #3066 from mtanda/cloudwatch_annotation · 25d93d10
```
(cloudwatch) annotation support
```
  Carl Bergquist committed Dec 15, 2015
  25d93d10 Browse Files
- cleanup(KairosDB): removed kairosdb from main repo, can easily be installed via… · e28c9b33
```
cleanup(KairosDB): removed kairosdb from main repo, can easily be installed via as plugin via its own plugin repo, https://github.com/grafana/datasource-plugin-kairosdb, closes #3524
```
  Torkel Ödegaard committed Dec 15, 2015
  e28c9b33 Browse Files