Torkel Ödegaard 35b970347a Merge branch 'v4.0.x'

2016-12-15 13:55:26 +01:00

..

api

fix(auth proxy, ldap): fixed so users cannot change password when ldap or auth proxy is enabled, fixes #2495, do not allow user to change email or username depending on what property auth proxy is using, fixes #6903

2016-12-14 22:19:25 +01:00

bus

(format) run go fmt in pkg

2016-12-14 12:17:38 +09:00

cmd

Merge branch 'master' into alerting_mqe

2016-12-12 19:01:50 +01:00

components

fix(webdav): adds missing auth headers

2016-12-06 09:02:14 +01:00

events

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

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

log

fix(logging): fixed default log level filter option not taking effect, fixex #6978

2016-12-15 13:54:47 +01:00

login

feat(ldap): better ldap logging, closes #6918

2016-12-14 22:01:02 +01:00

metrics

(typo) Exeuction -> Execution

2016-12-14 12:21:41 +09:00

middleware

Merge branch 'authproxy_ldap' of https://github.com/seuf/grafana into seuf-authproxy_ldap

2016-12-14 21:45:15 +01:00

models

feat(cli): adds command to reset admin password

2016-12-09 15:25:02 +01:00

plugins

feat(ux): completed work on getting started panel, #6466

2016-12-08 10:25:05 +01:00

services

Merge pull request #6952 from huydx/format-gofmt

2016-12-14 09:26:38 +01:00

setting

Merge branch 'authproxy_ldap' of https://github.com/seuf/grafana into seuf-authproxy_ldap

2016-12-14 21:45:15 +01:00

social

(format) run go fmt in pkg

2016-12-14 12:17:38 +09:00

tsdb

feat(mqe): add basic support for functions list

2016-12-14 22:29:17 +01:00

util

test(util): add unit test for string util

2016-06-03 15:06:54 +02:00