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

08 Sep, 2016 6 commits
- Merge branch 'master' into grafana-annotations · b8081b29
  Torkel Ödegaard committed Sep 08, 2016
  
  b8081b29 Browse Files
- feat(annotations): added support to show grafana stored annotations in graphs, #5982 · d60bd776
  Torkel Ödegaard committed Sep 08, 2016
  
  d60bd776 Browse Files
- fix(metrics): default updateSince to ms · 3c9432b7
  bergquist committed Sep 08, 2016
  
  3c9432b7 Browse Files
- fix(alerting): change execution time to ms · acf74cda
  bergquist committed Sep 08, 2016
  
  acf74cda Browse Files
- feat(emails): move bg color to main table · 5f934e02
  bergquist committed Sep 08, 2016
  
  5f934e02 Browse Files
- feat(profile): hide orgs list when it only contains one org · 21c5b543
  bergquist committed Sep 08, 2016
  
  21c5b543 Browse Files
07 Sep, 2016 18 commits
- tests(alerting): fixes broken tests. pointers and stuff 🤷 · 592ae5a3
  bergquist committed Sep 07, 2016
  
  592ae5a3 Browse Files
- docs(changelog): add note about merging #4718 · 30f36fe2
  bergquist committed Sep 07, 2016
  
  30f36fe2 Browse Files
- feat(alerting): include default notifications in alert tab · f56d45ac
  bergquist committed Sep 07, 2016
  
  f56d45ac Browse Files
- Merge branch 'emails' · c7691487
  bergquist committed Sep 07, 2016
  
  c7691487 Browse Files
- style: convert tabs to spaces · 62372978
  bergquist committed Sep 07, 2016
  
  62372978 Browse Files
- test(emails): update fake data model · 59cb51dc
  bergquist committed Sep 07, 2016
  
  59cb51dc Browse Files
- feat: right align value metrics · 9595916a
  bergquist committed Sep 07, 2016
  
  9595916a Browse Files
- test(alerting): fixes broken unit tests · 712061ab
  bergquist committed Sep 07, 2016
  
  712061ab Browse Files
- docs(go): update go dep to 1.6 · 166df66f
  bergquist committed Sep 07, 2016
  
  166df66f Browse Files
- Merge branch 'master' into emails · f2682404
  bergquist committed Sep 07, 2016
  
  f2682404 Browse Files
- Merge branch 'kfitzpatrick-custom-github-style-oauth' · 374016b9
  bergquist committed Sep 07, 2016
  
  374016b9 Browse Files
- docs(oauth): add generic_auth to docs · 10b3ee36
  bergquist committed Sep 07, 2016
  
  10b3ee36 Browse Files
- fix(oauth): remove github refs from generic auth · 53dddf1a
  bergquist committed Sep 07, 2016
  
  53dddf1a Browse Files
- feat(oauth): create struct for generic oauth and add config values · 3b6820ef
  bergquist committed Sep 07, 2016
  
  3b6820ef Browse Files
- Merge branch 'master' of github.com:grafana/grafana · 0d083bad
```
Conflicts:
	pkg/components/imguploader/s3uploader.go
```
  Torkel Ödegaard committed Sep 07, 2016
  0d083bad Browse Files
- feat(alerting): fixed s3 upload issue, progress on alerting on null/missing… · 50b41130
```
feat(alerting): fixed s3 upload issue, progress on alerting on null/missing data, updated ini package to get the support for line continuations
```
  Torkel Ödegaard committed Sep 07, 2016
  50b41130 Browse Files
- test(imageupload): add more specific tests · d1a7a23c
```
torkels commit will fix this unit test :)
```
  bergquist committed Sep 07, 2016
  d1a7a23c Browse Files
- Merge branch 'custom-github-style-oauth' of… · 4646723c
```
Merge branch 'custom-github-style-oauth' of https://github.com/kfitzpatrick/grafana into kfitzpatrick-custom-github-style-oauth
```
  bergquist committed Sep 07, 2016
  4646723c Browse Files
06 Sep, 2016 12 commits
- Merge branch 'master' of github.com:grafana/grafana · fc8f0721
```
Conflicts:
	pkg/services/alerting/eval_context.go
```
  Torkel Ödegaard committed Sep 06, 2016
  fc8f0721 Browse Files
- feat(alerting): progress on handling no data in alert query, #5860 · fbae6abb
  Torkel Ödegaard committed Sep 06, 2016
  
  fbae6abb Browse Files
- docs(changelog): add note about updating systemd description · 2e8d5ca5
  bergquist committed Sep 06, 2016
  
  2e8d5ca5 Browse Files
- Merge pull request #5971 from cicku/master · a02bef7d
```
Update systemd unit's description to be more understandable
```
  Carl Bergquist committed Sep 06, 2016
  a02bef7d Browse Files
- Update systemd unit's description to be more understandable · 6afb456b
```
Signed-off-by: Christopher Meng <i@cicku.me>
```
  Christopher Meng committed Sep 06, 2016
  6afb456b Browse Files
- feat(alerting): add support for retries · 04690ca9
```
ref #5855
```
  bergquist committed Sep 06, 2016
  04690ca9 Browse Files
- style(alerting): remove blank lines · 0d7a8712
  bergquist committed Sep 06, 2016
  
  0d7a8712 Browse Files
- fix(alert_tab): fix broken alert history · 22805ce5
  bergquist committed Sep 06, 2016
  
  22805ce5 Browse Files
- feat(alerting): filter notifications based on severity · 55b560a4
```
closes #5851
```
  bergquist committed Sep 06, 2016
  55b560a4 Browse Files
- fix(graph): fixed issue with duplicate metric calls when doing full page reload… · b1ed641d
```
fix(graph): fixed issue with duplicate metric calls when doing full page reload of  graph in edit/view mode
```
  Torkel Ödegaard committed Sep 06, 2016
  b1ed641d Browse Files
- feat(alerting): Save As removes alerts from panels, closes #5965 · 6b17cdbc
  Torkel Ödegaard committed Sep 06, 2016
  
  6b17cdbc Browse Files
- tech(notifications): splitt into 3 queries · 2ca7284a
```
closes #5883
```
  bergquist committed Sep 06, 2016
  2ca7284a Browse Files
05 Sep, 2016 4 commits
- feat(notifications): add support for default notifications · c893e5d2
```
ref #5883
```
  bergquist committed Sep 05, 2016
  c893e5d2 Browse Files
- chore(tsdb): remove some logging · eb0396ad
  bergquist committed Sep 05, 2016
  
  eb0396ad Browse Files
- tech(gitignore): ignore vscode folder · 015423b2
  bergquist committed Sep 05, 2016
  
  015423b2 Browse Files
- fix(.editorconfig): correct spelling of indent_style · b501590a
```
Unleash the fucking fury
```
  Carl Bergquist committed Sep 05, 2016
  b501590a Browse Files