Commits · 6b90587d274bc5e37bb71f8f2a815135419b08dd · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

16 Aug, 2016 4 commits
- feat(alerting): fixing failing go unit test · 6b90587d
  Torkel Ödegaard committed Aug 16, 2016
  
  6b90587d Browse Files
- feat(alerting): fixing failing typescript build · 65ce01fb
  Torkel Ödegaard committed Aug 16, 2016
  
  65ce01fb Browse Files
- Merge branch 'alerting' of github.com:grafana/grafana into alerting · fe9d591b
```
Conflicts:
	pkg/services/sqlstore/migrations/alert_mig.go
```
  Torkel Ödegaard committed Aug 16, 2016
  fe9d591b Browse Files
- feat(alerting): making progress on alerting list, #5784 · f934081b
  Torkel Ödegaard committed Aug 16, 2016
  
  f934081b Browse Files
15 Aug, 2016 8 commits
- feat(alerting): make post execution fields nullable · aaabdbe3
  bergquist committed Aug 15, 2016
  
  aaabdbe3 Browse Files
- fix(alerting): rename events to evalMatches · 2c2157f3
  bergquist committed Aug 15, 2016
  
  2c2157f3 Browse Files
- Merge branch 'query_part_refactor' into alerting · 9f29c541
```
Conflicts:
	pkg/services/sqlstore/migrations/alert_mig.go
	pkg/services/sqlstore/migrations/heartbeat_mig.go
```
  Torkel Ödegaard committed Aug 15, 2016
  9f29c541 Browse Files
- feat(alerting): can now change reducer · d8d951c8
  Torkel Ödegaard committed Aug 15, 2016
  
  d8d951c8 Browse Files
- feat(query_part): refactoring query part · 1418cbbd
  Torkel Ödegaard committed Aug 15, 2016
  
  1418cbbd Browse Files
- feat(alerting): doing schema changes · 0392fde3
  Torkel Ödegaard committed Aug 15, 2016
  
  0392fde3 Browse Files
- feat(query parts): refactoring query part component to support actions · befca9bb
  Torkel Ödegaard committed Aug 15, 2016
  
  befca9bb Browse Files
- Merge branch 'master' into alerting · 4d0982a2
  bergquist committed Aug 15, 2016
  
  4d0982a2 Browse Files
14 Aug, 2016 9 commits
- Merge branch 'v3.1.x' · 0ea3458f
```
Conflicts:
	public/app/features/dashboard/dynamic_dashboard_srv.ts
```
  Torkel Ödegaard committed Aug 14, 2016
  0ea3458f Browse Files
- fix(templating): another fix for repeating panels and having old panels/scoped… · 58df60f6
```
fix(templating): another fix for repeating panels and having old panels/scoped vars stuck after switching repeat variable, fixes #5795
```
  Torkel Ödegaard committed Aug 14, 2016
  58df60f6 Browse Files
- fix repeat panels (#5796) · cbf0e77a
  Julian Einwag committed Aug 14, 2016
  
  cbf0e77a Browse Files
- docs(): updated docs · 1eca0d7c
  Torkel Ödegaard committed Aug 14, 2016
  
  1eca0d7c Browse Files
- Merge branch 'master' of github.com:grafana/grafana · 76e4b7ce
  Torkel Ödegaard committed Aug 14, 2016
  
  76e4b7ce Browse Files
- fix repeat panels (#5796) · deb245f5
  Julian Einwag committed Aug 14, 2016
  
  deb245f5 Browse Files
- (cloudwatch) support ApplicationELB (#5802) · 7a1011ac
  Mitsuhiro Tanda committed Aug 14, 2016
  
  7a1011ac Browse Files
- Merge branch 'master' of github.com:grafana/grafana · 8499d32d
  Torkel Ödegaard committed Aug 14, 2016
  
  8499d32d Browse Files
- fix(graph): fixed issue with tooltip introduced in recent commit · d894c137
  Torkel Ödegaard committed Aug 14, 2016
  
  d894c137 Browse Files
13 Aug, 2016 5 commits
- fix(godep): fixed godep dependency · 46ea3ed9
  Torkel Ödegaard committed Aug 13, 2016
  
  46ea3ed9 Browse Files
- feat(alerting): list all series in alert email · fb7a6c07
  bergquist committed Aug 13, 2016
  
  fb7a6c07 Browse Files
- Merge pull request #5809 from kou/patch-1 · a530df84
```
Update the number of ways
```
  Carl Bergquist committed Aug 13, 2016
  a530df84 Browse Files
- feat(alerting): improve email notifications layout · c4e90547
  bergquist committed Aug 13, 2016
  
  c4e90547 Browse Files
- Update the number of ways · 46630df8
  Kouhei Sutou committed Aug 13, 2016
  
  46630df8 Browse Files
12 Aug, 2016 8 commits
- feat(alerting): disable visual thresholds while alert is enabled · 74dbd7fb
  Torkel Ödegaard committed Aug 12, 2016
  
  74dbd7fb Browse Files
- feat(thresholds): hide threshold handles when second y axis is shown · 7242dc2e
  Torkel Ödegaard committed Aug 12, 2016
  
  7242dc2e Browse Files
- Merge branch 'alerting' of github.com:grafana/grafana into alerting · 597103a1
  Torkel Ödegaard committed Aug 12, 2016
  
  597103a1 Browse Files
- feat(thresholds): refactoring and adding many unit tests · 06210a4a
  Torkel Ödegaard committed Aug 12, 2016
  
  06210a4a Browse Files
- chore(notifications): remove commented test · 1dcae464
  bergquist committed Aug 12, 2016
  
  1dcae464 Browse Files
- feat(alerting): add alert message to slack integration · 16e75a30
  bergquist committed Aug 12, 2016
  
  16e75a30 Browse Files
- fix(metrics): typo · e7613b8b
  bergquist committed Aug 12, 2016
  
  e7613b8b Browse Files
- fix(metrics): add ending dot for graphite prefix · 2fa97427
  bergquist committed Aug 12, 2016
  
  2fa97427 Browse Files
11 Aug, 2016 6 commits
- feat(thresholds): more work on thresholds, within and outside types no work · 895cff78
  Torkel Ödegaard committed Aug 11, 2016
  
  895cff78 Browse Files
- Merge branch 'alerting' of github.com:grafana/grafana into alerting · 7a5dda9e
  Torkel Ödegaard committed Aug 11, 2016
  
  7a5dda9e Browse Files
- feat(thresholds): dragging thresholds works again · 6793eed6
  Torkel Ödegaard committed Aug 11, 2016
  
  6793eed6 Browse Files
- feat(thresholds): updated design for grab handles · 224ceb0a
  Torkel Ödegaard committed Aug 11, 2016
  
  224ceb0a Browse Files
- feat(alerting): add global usage metrics for alerting · 93772649
```
closes #5786
```
  bergquist committed Aug 11, 2016
  93772649 Browse Files
- feat(thresholds): lots of progress on thresholds · 89ca15f3
  Torkel Ödegaard committed Aug 11, 2016
  
  89ca15f3 Browse Files