Commits · 76fc48e2ebbebc18a5479f3cdd2352b636c30f2e · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

17 Oct, 2018 9 commits
- Merge pull request #1 from grafana/master · 76fc48e2
```
Syncing
```
  Yuan Liu committed Oct 17, 2018
  76fc48e2 Browse Files
- changelog: adds note about closing #12330 and #6696 · 2afec0e7
```
[skip ci]
```
  bergquist committed Oct 17, 2018
  2afec0e7 Browse Files
- Merge pull request #13680 from davewat/add-notification-channel-option-to-disable-resolved-alert · 94e2d2b4
```
Add channel option to disable the resolved alert (OK Message)
```
  Carl Bergquist committed Oct 17, 2018
  94e2d2b4 Browse Files
- Merge pull request #13352 from amuraru/patch-2 · 29f1c925
```
Updated phantomjs render script to take full height screenshots
```
  Torkel Ödegaard committed Oct 17, 2018
  29f1c925 Browse Files
- removes d in disableResolvedMessage · 70385119
  bergquist committed Oct 17, 2018
  
  70385119 Browse Files
- alerting: tests default value for disable resolve message · 5566a61a
  bergquist committed Oct 17, 2018
  
  5566a61a Browse Files
- Merge pull request #13696 from Yukinoshita-Yukino/patch-1 · 176c8579
```
Update doc due to Dingtalk client layout change
```
  Marcus Efraimsson committed Oct 17, 2018
  176c8579 Browse Files
- update doc due to client layout change · 7946a405
  Yuan Liu committed Oct 17, 2018
  
  7946a405 Browse Files
- clean up tests · a3137e73
  Dave Waters committed Oct 16, 2018
  
  a3137e73 Browse Files
16 Oct, 2018 16 commits
- Merge branch 'master' of http://github.com/grafana/grafana into… · e9b80517
```
Merge branch 'master' of http://github.com/grafana/grafana into add-notification-channel-option-to-disable-resolved-alert
```
  Dave Waters committed Oct 16, 2018
  e9b80517 Browse Files
- fix gofmt, add test, correct noted concerns with default value · 0eae7b07
  Dave Waters committed Oct 16, 2018
  
  0eae7b07 Browse Files
- fix gofmt, add test, correct noted concerns with default value · c4dcf5a4
  Dave Waters committed Oct 16, 2018
  
  c4dcf5a4 Browse Files
- changelog: add notes about closing #13629 · 03b8bcc4
```
[skip ci]
```
  Marcus Efraimsson committed Oct 16, 2018
  03b8bcc4 Browse Files
- Merge pull request #13678 from ramiro/add-encrypt-mssql-ds-option · 3612a1c0
```
Add encrypt setting to MSSQL data source.
```
  Marcus Efraimsson committed Oct 16, 2018
  3612a1c0 Browse Files
- add encrypt connstr param conditionally on the value chosen via GUI. · 49a3bd30
  Ramiro Morales committed Oct 16, 2018
  
  49a3bd30 Browse Files
- update latest.json to latest stable version · a825f42a
```
[skip ci]
```
  Marcus Efraimsson committed Oct 16, 2018
  a825f42a Browse Files
- update changelog · c9db7f7c
```
[skip ci]
```
  Marcus Efraimsson committed Oct 16, 2018
  c9db7f7c Browse Files
- build: Upgraded nodejs to 8 on appveyor · f1ab0ea4
  Leonard Gram committed Oct 16, 2018
  
  f1ab0ea4 Browse Files
- rename UI Option, align with control, update tests · 18c73631
  Dave Waters committed Oct 16, 2018
  
  18c73631 Browse Files
- Merge pull request #13686 from grafana/logo-alt-text · c1399a04
```
Logo alt text + unwanted char
```
  Torkel Ödegaard committed Oct 16, 2018
  c1399a04 Browse Files
- Remove unwanted char · 2a82b57d
  Johannes Schill committed Oct 16, 2018
  
  2a82b57d Browse Files
- Fix incorrect alt text on logo · 6d3f037e
  Johannes Schill committed Oct 16, 2018
  
  6d3f037e Browse Files
- update, don't remove 'Known Issues' docs section. · cf6faabd
  Ramiro Morales committed Oct 15, 2018
  
  cf6faabd Browse Files
- update provisioning docs. · 6a8d1c45
  Ramiro Morales committed Oct 15, 2018
  
  6a8d1c45 Browse Files
- fix new setting default value handling. · 90de703e
  Ramiro Morales committed Oct 15, 2018
  
  90de703e Browse Files
15 Oct, 2018 15 commits
- rename new JSON data attrbute. · d859a6ae
  Ramiro Morales committed Oct 15, 2018
  
  d859a6ae Browse Files
- changelog: add notes about closing #13464 · f4b7b003
```
[skip ci]
```
  Marcus Efraimsson committed Oct 16, 2018
  f4b7b003 Browse Files
- changelog: add notes about closing #13553 · baa39854
```
[skip ci]
```
  Marcus Efraimsson committed Oct 16, 2018
  baa39854 Browse Files
- update changelog · e86027e3
```
[skip ci]
```
  Marcus Efraimsson committed Oct 16, 2018
  e86027e3 Browse Files
- Merge pull request #13683 from eripe970/patch-2 · efe9d278
```
Small readme update, link to license
```
  Carl Bergquist committed Oct 15, 2018
  efe9d278 Browse Files
- Merge pull request #13681 from eripe970/patch-1 · 795a24d0
```
Small fixes to documentation
```
  Carl Bergquist committed Oct 15, 2018
  795a24d0 Browse Files
- doc(documentation) license · 85597862
```
Link to the grafana license file from the docs.
```
  Erik Pettersson committed Oct 15, 2018
  85597862 Browse Files
- doc(documenation) · 25b68809
```
Use same name for Elasticsearch. The docs contained a mix of Elastic and Elasticsearch.
```
  Erik Pettersson committed Oct 15, 2018
  25b68809 Browse Files
- add channel option to disable the resolved alert (OK Message) that is sent when… · 6376154b
```
add channel option to disable the resolved alert (OK Message) that is sent when condition returns to normal.
```
  Dave Waters committed Oct 15, 2018
  6376154b Browse Files
- Add 'encrypt' setting to MSSQL data source. · 37f16ca8
```
Fixes #13629
```
  Ramiro Morales committed Oct 15, 2018
  37f16ca8 Browse Files
- Merge pull request #13660 from grafana/alerting-validation-messages · 938541be
```
Alerting: Propagate alert validation issues to the api/user
```
  Torkel Ödegaard committed Oct 15, 2018
  938541be Browse Files
- Merge pull request #13675 from ankon/patch-1 · 70945850
```
Fix grammar in log message
```
  Marcus Efraimsson committed Oct 15, 2018
  70945850 Browse Files
- build: makes sure publisher.sh is available when deploying. · 6fd34306
  Leonard Gram committed Oct 15, 2018
  
  6fd34306 Browse Files
- Fix grammar in log message · 27227422
  Andreas Kohn committed Oct 15, 2018
  
  27227422 Browse Files
- changelog: add notes about closing #13641 #13650 · bac937f0
```
[skip ci]
```
  Marcus Efraimsson committed Oct 15, 2018
  bac937f0 Browse Files