Commits · 7ce33c31ecc8d8c772566af147ec9930214e6fab · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

17 Nov, 2016 14 commits
- Merge branch 'master' of github.com:grafana/grafana · 7ce33c31
  Torkel Ödegaard committed Nov 17, 2016
  
  7ce33c31 Browse Files
- changelog(): added entry for PR #6579 · b9cfb19a
  Torkel Ödegaard committed Nov 17, 2016
  
  b9cfb19a Browse Files
- Merge branch 'utkarshcmu-or_alerting' · e34bf9a1
  Torkel Ödegaard committed Nov 17, 2016
  
  e34bf9a1 Browse Files
- refactor(alerting): refactoring PR for OR conditions, #6579 · 62e8a039
  Torkel Ödegaard committed Nov 17, 2016
  
  62e8a039 Browse Files
- fix(alerting): remove possible divide by zero panic · 3ea66ebe
```
ref #6599
```
  bergquist committed Nov 17, 2016
  3ea66ebe Browse Files
- Merge branch 'or_alerting' of https://github.com/utkarshcmu/grafana into utkarshcmu-or_alerting · 457ae743
  Torkel Ödegaard committed Nov 17, 2016
  
  457ae743 Browse Files
- fix(templating): work on fixing exporting issues when using templating… · 98d1748e
```
fix(templating): work on fixing exporting issues when using templating variables, like data source variables, and panel repeats, requires more work #6189
```
  Torkel Ödegaard committed Nov 17, 2016
  98d1748e Browse Files
- feat(templating): don't persist template variable options when variable has… · 9d5928dd
```
feat(templating): don't persist template variable options when variable has refresh enabled, closes #6586
```
  Torkel Ödegaard committed Nov 17, 2016
  9d5928dd Browse Files
- fix(templating): fixed issue when adding template variable, fixes #6622 · eafe0d6b
  Torkel Ödegaard committed Nov 17, 2016
  
  eafe0d6b Browse Files
- Added tests for firingEvaluation string · aae33b36
  utkarshcmu committed Nov 17, 2016
  
  aae33b36 Browse Files
- fix(dashboard): fixed issue when dragging new panel to drop zone · 196fdbfd
  Torkel Ödegaard committed Nov 17, 2016
  
  196fdbfd Browse Files
- Added braces to single condition firingEvaluation string · fc82dac8
  utkarshcmu committed Nov 17, 2016
  
  fc82dac8 Browse Files
- Added firingEvalution to Rule test · 690868c8
  utkarshcmu committed Nov 17, 2016
  
  690868c8 Browse Files
- fix(dashboard): minor fixes, and restored in-activity timer to 1min · a45fdfdd
  Torkel Ödegaard committed Nov 17, 2016
  
  a45fdfdd Browse Files
16 Nov, 2016 24 commits
- testdata(): added test graph for null stacking scenario, #6566 · 42167a65
  Torkel Ödegaard committed Nov 16, 2016
  
  42167a65 Browse Files
- docs(): minor update to centos docs about font packages needed for phantomjs · f52c6aaf
  Torkel Ödegaard committed Nov 16, 2016
  
  f52c6aaf Browse Files
- fix(singletat): Support repeated template variables in prefix/postfix, fixes #6595 · 4581bb4a
  Torkel Ödegaard committed Nov 16, 2016
  
  4581bb4a Browse Files
- cleanup(sass): removed tight-form styles · e6776f71
  Torkel Ödegaard committed Nov 16, 2016
  
  e6776f71 Browse Files
- cleanup(): removed unused gfbox style · d7e8753c
  Torkel Ödegaard committed Nov 16, 2016
  
  d7e8753c Browse Files
- change(alerting): delete alert rule from panel model when duplicating panel · 079b0ef4
  Torkel Ödegaard committed Nov 16, 2016
  
  079b0ef4 Browse Files
- ux(tweak): minor polish to date picker styling · a50178ea
  Torkel Ödegaard committed Nov 16, 2016
  
  a50178ea Browse Files
- ux(tweak): minor polish to date picker styling · f64385cf
  Torkel Ödegaard committed Nov 16, 2016
  
  f64385cf Browse Files
- cleanup(): removed unused uio-angular tab component · 465451c2
  Torkel Ödegaard committed Nov 16, 2016
  
  465451c2 Browse Files
- fix(error handling): fixed server side error handling page · 18e965c7
  Torkel Ödegaard committed Nov 16, 2016
  
  18e965c7 Browse Files
- fix(404): fixed 404 page · e3564d12
  Torkel Ödegaard committed Nov 16, 2016
  
  e3564d12 Browse Files
- fix up sass lint warnings (#6603) · c980efd4
  Dan Cech committed Nov 16, 2016
  
  c980efd4 Browse Files
- Merge pull request #6584 from tomkozlowski/bugfix/oauth-login-bearer-token · eacb7c8a
```
explicitly set oauth2 token to Bearer Type
```
  Dan Cech committed Nov 16, 2016
  eacb7c8a Browse Files
- fix(units): fixed issue with data rate bit units, fixes #6602 · e7a30ac4
  Torkel Ödegaard committed Nov 16, 2016
  
  e7a30ac4 Browse Files
- added explicitly setting token as Bearer Type · a353c8d1
  Tom Kozlowski committed Nov 16, 2016
  
  a353c8d1 Browse Files
- ux(view/tv mode): treat tab change as user activity, resets in activity timer · 4fa995ea
  Torkel Ödegaard committed Nov 16, 2016
  
  4fa995ea Browse Files
- fix(build): fixed failing unit test · 9c7f8268
  Torkel Ödegaard committed Nov 16, 2016
  
  9c7f8268 Browse Files
- fix(ux): fixed dropzone display issues, fixes #6598 · 171335bf
  Torkel Ödegaard committed Nov 16, 2016
  
  171335bf Browse Files
- docs(notifications): fixes typo · e12a4f6b
  bergquist committed Nov 16, 2016
  
  e12a4f6b Browse Files
- (cloudwatch) long retention support (#6547) · 9740752c
  Mitsuhiro Tanda committed Nov 16, 2016
  
  9740752c Browse Files
- Removed green border from OK alerts. Makes dashboards too busy, competes for… · 10cf32f8
```
Removed green border from OK alerts. Makes dashboards too busy, competes for attention where action is unnceessary (#6555)
```
  Matt Toback committed Nov 16, 2016
  10cf32f8 Browse Files
- fix(panel): set initial transparency state at first link · f91a833e
  Torkel Ödegaard committed Nov 16, 2016
  
  f91a833e Browse Files
- docs(api): add docs about creating new org · cbe8af96
```
close #6588
```
  bergquist committed Nov 16, 2016
  cbe8af96 Browse Files
- Added OR condition in docs · f46c4c88
  utkarshcmu committed Nov 15, 2016
  
  f46c4c88 Browse Files
15 Nov, 2016 2 commits
- Correct series highlight (#6578) · a4de6da9
```
solves issue #6573
```
  Ben RUBSON committed Nov 15, 2016
  a4de6da9 Browse Files
- Added tests for checking nested operators · 8d0bcd23
  utkarshcmu committed Nov 15, 2016
  
  8d0bcd23 Browse Files