Commits · 9c5436c648bf300bd20e44ca24049a3fac3cca17 · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

13 Sep, 2016 2 commits
- feat(templating): set default sort order · 9c5436c6
  bergquist committed Sep 13, 2016
  
  9c5436c6 Browse Files
- Merge branch 'template_sort' of https://github.com/mtanda/grafana into mtanda-template_sort · e3488221
  bergquist committed Sep 13, 2016
  
  e3488221 Browse Files
12 Sep, 2016 5 commits
- fix(setting): broken code · 157ab1ba
  bergquist committed Sep 12, 2016
  
  157ab1ba Browse Files
- docs(config): add docs for how to run grafana behind a reverse proxy · 811b7188
  bergquist committed Sep 12, 2016
  
  811b7188 Browse Files
- tech(tsdb): remove skip ssl setting. should be based on datasource settings · d7bf70a7
  bergquist committed Sep 12, 2016
  
  d7bf70a7 Browse Files
- feat(metrics): measure proxy requests · 6c5860d3
  bergquist committed Sep 12, 2016
  
  6c5860d3 Browse Files
- fix(middleware): typo · eb673fd1
  bergquist committed Sep 12, 2016
  
  eb673fd1 Browse Files
10 Sep, 2016 3 commits
- fix(graph): fixed showing rendering error in inspector, fixes #5995 · 014b70de
  Torkel Ödegaard committed Sep 10, 2016
  
  014b70de Browse Files
- fix(table): fixed issue with using mixed data source in table panel, fixes #5999 · 7aab4a4a
  Torkel Ödegaard committed Sep 10, 2016
  
  7aab4a4a Browse Files
- support connect ldap server with starttls (#5969) · 7b1c374f
```
* support connect ldap server with starttls

* add more doc for start_tls option
```
  Chen Chenglong committed Sep 10, 2016
  7b1c374f Browse Files
09 Sep, 2016 3 commits
- fix(metrics): ignore datasource proxy requests · 4edb3172
  bergquist committed Sep 09, 2016
  
  4edb3172 Browse Files
- tech(metrics): move all request counters into one middleware · e7b56c63
  bergquist committed Sep 09, 2016
  
  e7b56c63 Browse Files
- fix(alering): the crocdile turned on me > < · 583790e6
```
closes #5855
```
  bergquist committed Sep 09, 2016
  583790e6 Browse Files
08 Sep, 2016 10 commits
- Merge pull request #5994 from mtanda/prometheus_fix_legend_template · 51d2534f
```
(prometheus) fix template variable expansion in legend
```
  Carl Bergquist committed Sep 08, 2016
  51d2534f Browse Files
- (prometheus) fix template variable expansion in legend · 9d09e5bb
  Mitsuhiro Tanda committed Sep 09, 2016
  
  9d09e5bb Browse Files
- feat(alerting): make it possible to skip ssl verification for alerting https requests · aa80b52c
  bergquist committed Sep 08, 2016
  
  aa80b52c Browse Files
- fix(query): requires all that all series are empty to set NoDataFound · 7b9099ef
  bergquist committed Sep 08, 2016
  
  7b9099ef Browse Files
- fix(alerting): fixes bug in query conditions · 9511f89a
  bergquist committed Sep 08, 2016
  
  9511f89a Browse Files
- tech: remove unused files · bec099cd
  bergquist committed Sep 08, 2016
  
  bec099cd 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 17 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