carl bergquist fab1062c0b Merge branch 'ldap_login_hints' of https://github.com/tmonk42/grafana into tmonk42-ldap_login_hints ...

Conflicts:
	conf/defaults.ini
	pkg/setting/setting.go

closes #2571
closes #2494

2015-12-11 15:16:57 +01:00

..

api

Merge branch 'ldap_login_hints' of https://github.com/tmonk42/grafana into tmonk42-ldap_login_hints

2015-12-11 15:16:57 +01:00

bus

clarify which handler is not found

2015-06-26 12:32:24 -07:00

cmd

Fixed 404 error for robots.txt

2015-09-16 11:02:50 +10:00

components

Graph: fixed PNG rendering of panels with legend table to the right, #2185

2015-06-19 14:13:25 -04:00

events

feat(signup): progress on new sign up and email verification flow, #2353

2015-08-28 15:14:24 +02:00

log

pkg/log: implement syslog logger

2015-11-07 18:34:55 -08:00

login

feat(ldap): refactoring of PR #2928 updated docs

2015-10-26 16:21:03 +01:00

metrics

refactoring: minor refactoring and handling of known data source plugins

2015-10-26 16:37:45 +01:00

middleware

fix(logging): fixed so that router_logging = true actually logs all http requests, fixes #2902

2015-10-10 17:55:15 -04:00

models

add with_credentials to datasource model

2015-12-09 14:44:28 +09:00

plugins

fix(influxdb): influxdb data source did not use right http abstraction for metric queries, fixes #2919

2015-10-10 11:46:00 -04:00

services

add with_credentials to datasource model

2015-12-09 14:44:28 +09:00

setting

Merge branch 'ldap_login_hints' of https://github.com/tmonk42/grafana into tmonk42-ldap_login_hints

2015-12-11 15:16:57 +01:00

social

gofmt happiness

2015-11-07 11:32:06 -06:00

util

feat(invite): progress on invite feature, #2353

2015-08-10 13:47:06 +02:00