Torkel Ödegaard b0fe69822a Merge branch 'master' into alerting ...

Conflicts:
	public/app/core/services/alert_srv.ts
	public/app/partials/confirm_modal.html

2016-07-18 18:22:35 +02:00

..

alerting

docs(alerting): rewrite alert docs

2016-06-20 17:05:16 +02:00

datasources

grammar fix in docs

2016-07-02 08:27:31 -07:00

guides

docs(3.1): initial post about whats new in 3.1

2016-06-21 16:29:17 +02:00

http_api

docs(preferences): Document user and org preferences (#5087)

2016-05-18 18:31:59 +02:00

installation

Merge branch 'v3.1.x'

2016-07-12 15:54:31 +02:00

plugins

fix broken link to grafana.net, standardize on https://grafana.net for links

2016-04-22 12:13:39 -04:00

project

Fix typo in docs

2016-02-02 17:47:06 +05:30

reference

docs(): spelling fix

2016-06-23 17:31:22 +02:00

tutorials

Fixed some more typos in docs

2015-10-30 02:07:08 -07:00

index.md

Update index.md (#4956)

2016-05-10 08:44:18 +02:00

jsearch.md

Added grafana 1.x docs to main repo

2015-03-10 08:56:03 +01:00

search.md

Added grafana 1.x docs to main repo

2015-03-10 08:56:03 +01:00

test.md

Added grafana 1.x docs to main repo

2015-03-10 08:56:03 +01:00

versions.html_fragment

docs(): updated download links

2016-06-23 10:35:47 +02:00