Fabian Reinartz 2d0b8e8b94 Merge branch 'master' into dev-2.0

2017-10-05 13:09:18 +02:00

..

_base.html

Point help to docs, not main Prometheus website

2017-08-25 10:53:36 +02:00

alerts.html

Fix alert label display in /alerts UI

2017-07-08 11:42:13 +02:00

config.html

Partition the status tab into items in a dropdown

2016-05-18 18:13:55 +02:00

flags.html

Partition the status tab into items in a dropdown

2016-05-18 18:13:55 +02:00

graph.html

#2371 fix to display utc date at datetime picker

2017-09-16 11:38:29 +09:00

rules.html

Move /rules to new format (#2901)

2017-07-08 11:38:02 +02:00

status.html

Preserve Alertmanager URLs as *url.URL.

2017-04-25 16:17:46 +10:00

targets.html

Backport the templating fix from master

2017-09-14 18:12:00 +02:00