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

13 Aug, 2015 4 commits
- docs(): Began work on stack install and config tutorial · f784551e
  Torkel Ödegaard committed Aug 13, 2015
  
  f784551e Browse Files
- docs(): minor update · a3d91699
  Torkel Ödegaard committed Aug 13, 2015
  
  a3d91699 Browse Files
- Merge pull request #2502 from mtanda/stack_override_tooltip · e8750228
```
don't calculate cumulative value if series overrides stack to false
```
  Torkel Ödegaard committed Aug 13, 2015
  e8750228 Browse Files
- don't calculate cumulative value if series overrides stack to false · caccacf5
  Mitsuhiro Tanda committed Aug 13, 2015
  
  caccacf5 Browse Files
12 Aug, 2015 5 commits
- Merge branch 'master' of https://github.com/mattttt/grafana · 5aee9815
```
Conflicts:
	docs/sources/installation/debian.md
	docs/sources/installation/ldap.md
```
  Torkel Ödegaard committed Aug 12, 2015
  5aee9815 Browse Files
- fix(db): remove stars and tags when removing user or dashboard, fixes #2016 · e6d09b32
  Torkel Ödegaard committed Aug 12, 2015
  
  e6d09b32 Browse Files
- feat(admin): Deleting org from orgs list now works, will permanently delete… · 8fcaa499
```
feat(admin): Deleting org from orgs list now works, will permanently delete dashboards, data sources, etc, closes #2457
```
  Torkel Ödegaard committed Aug 12, 2015
  8fcaa499 Browse Files
- Merge pull request #2492 from agilgur5/master · 7370af9a
```
docs(ldap): Clarify LDAP features and sample config
```
  Torkel Ödegaard committed Aug 12, 2015
  7370af9a Browse Files
- docs(ldap): Clarify LDAP features and sample config · e4baef94
```
* Clarify certain features, such as multiple mappings
* Fixup ldap.toml sample config
* Fixup docs README's port number
* Fixup bad link from LDAP docs to Configuration docs
* Fixup some spelling, grammar, and line endings
```
  Anton Gilgur committed Aug 11, 2015
  e4baef94 Browse Files
11 Aug, 2015 31 commits
- Merge pull request #11 from mattttt/trent-update · 8c05f9cf
```
add text panel page
```
  Trent White committed Aug 11, 2015
  8c05f9cf Browse Files
- add text panel page · ebcab0f2
  Trent White committed Aug 11, 2015
  
  ebcab0f2 Browse Files
- Update templating.md · 14996bd0
  Matt committed Aug 11, 2015
  
  14996bd0 Browse Files
- Update templating.md · dd9fb9d5
  Matt committed Aug 11, 2015
  
  dd9fb9d5 Browse Files
- Merge pull request #10 from mattttt/build-patch-1 · f3ffed67
```
Reformatted a confusing part of of the running grafana locally section
```
  Matt committed Aug 11, 2015
  f3ffed67 Browse Files
- Reformatted a confusing part of of the running grafana locally section · 5b342dd2
  Matt Toback committed Aug 11, 2015
  
  5b342dd2 Browse Files
- Merge pull request #9 from mattttt/trent-update · e626bbf4
```
formatting tweak, added datasource overview blurb.
```
  Trent White committed Aug 11, 2015
  e626bbf4 Browse Files
- formatting tweak, added datasource overview blurb. · 04795709
  Trent White committed Aug 11, 2015
  
  04795709 Browse Files
- fix(graphite): Import dashboard from graphite is working again, fixes #2490 · 745162c5
  Torkel Ödegaard committed Aug 11, 2015
  
  745162c5 Browse Files
- fix(influxdb 0.9): removed function from function dropdown as this function… · 089508db
```
fix(influxdb 0.9): removed  function from function dropdown as this function does not exist in InfluxDB 0.9
```
  Torkel Ödegaard committed Aug 11, 2015
  089508db Browse Files
- Merge pull request #8 from mattttt/ct-additions · a912323d
```
Added patch from ct
```
  Matt committed Aug 11, 2015
  a912323d Browse Files
- Added patch from ct · 511a592e
  Matt Toback committed Aug 11, 2015
  
  511a592e Browse Files
- Merge pull request #7 from mattttt/mattttt-docs · d132d3ab
```
Mattttt docs
```
  Matt committed Aug 11, 2015
  d132d3ab Browse Files
- Merge pull request #6 from mattttt/trent-docs-update · fb9b5e42
```
openTSDB image was broken
```
  Trent White committed Aug 11, 2015
  fb9b5e42 Browse Files
- openTSDB image was broken · 8dcc5645
  Trent White committed Aug 11, 2015
  
  8dcc5645 Browse Files
- Update screencasts.md · c6798892
```
tweaks
```
  raj dutt committed Aug 11, 2015
  c6798892 Browse Files
- Sanity checked and verified for merge · eea5b026
  Matt Toback committed Aug 11, 2015
  
  eea5b026 Browse Files
- Update gettingstarted.md · 331e858e
  raj dutt committed Aug 11, 2015
  
  331e858e Browse Files
- Merge remote-tracking branch 'origin/master' · 3d602a25
  Trent White committed Aug 11, 2015
  
  3d602a25 Browse Files
- Merge branch 'trent-docs' · 14386a2f
```
Conflicts:
	docs/sources/reference/templating.md
```
  Trent White committed Aug 11, 2015
  14386a2f Browse Files
- Update gettingstarted.md · 4e91e054
  raj dutt committed Aug 11, 2015
  
  4e91e054 Browse Files
- update content on annotations · ea0bec8b
  Trent White committed Aug 11, 2015
  
  ea0bec8b Browse Files
- Update singlestat.md · c2e8a1d7
  raj dutt committed Aug 11, 2015
  
  c2e8a1d7 Browse Files
- Update playlist.md · c6155723
  raj dutt committed Aug 11, 2015
  
  c6155723 Browse Files
- update to templating doc · 8c64afc8
  Trent White committed Aug 11, 2015
  
  8c64afc8 Browse Files
- Update templating.md · eafd1d8c
  raj dutt committed Aug 11, 2015
  
  eafd1d8c Browse Files
- Update templating.md · df0673f9
  raj dutt committed Aug 11, 2015
  
  df0673f9 Browse Files
- feat(timepicker): added new relative time option , will set time range to… · fe093c63
```
feat(timepicker): added new relative time option , will set time range to midnight to now, closes #1186
```
  Torkel Ödegaard committed Aug 11, 2015
  fe093c63 Browse Files
- Update basic_concepts.md · ed536f18
  raj dutt committed Aug 11, 2015
  
  ed536f18 Browse Files
- Updates to dashlist article · 96590f59
  Matt Toback committed Aug 11, 2015
  
  96590f59 Browse Files
- updates to screencasts page, with descriptions of each · 32bfcbcd
  Trent White committed Aug 11, 2015
  
  32bfcbcd Browse Files