Torkel Ödegaard 11e35f7b68 Merge remote-tracking branch 'origin/master' into panelbase 10 éve
..
cloudwatch 7d8519f5f0 add seoul region 10 éve
dtos 1bca28ad12 include the jsonData in the AppSettings DTO 10 éve
static 4fe72ebf69 feat(macaron): upgrades macaron version 10 éve
admin_settings.go f0087c93b8 fix(admin settings view): always censor provider_config for system info view, fixes #3268 10 éve
admin_users.go f5db9950f8 fixed gofmt tests 10 éve
api.go f94599cd29 merge apiPlugins with appPlugins 10 éve
api_test.go cb8110cd48 Refactoring, worked on middleware unit tests, and began thinking about api unit tests, #1921 10 éve
apikey.go f81bde5643 Refactoring some api handlers to use the new Response return object 10 éve
app_routes.go f94599cd29 merge apiPlugins with appPlugins 10 éve
app_settings.go c1e94e61d0 feat(apps): lots of more work on apps, changed app_plugin to app_settings in order to to confuse the app plugin model (definition) and app org settings 10 éve
common.go bdb67d4909 fix(build): fixed dependency and build issue 10 éve
dashboard.go d8b90721b3 Able to display login Id of the user in Last Updated By 10 éve
dashboard_snapshot.go 1952ebf7c4 Fixed failing gofmt tests 10 éve
dataproxy.go 4fe72ebf69 feat(macaron): upgrades macaron version 10 éve
dataproxy_test.go 6e532231dc Fix dataproxy_test.go tests 10 éve
datasources.go c1e94e61d0 feat(apps): lots of more work on apps, changed app_plugin to app_settings in order to to confuse the app plugin model (definition) and app org settings 10 éve
frontendsettings.go 4f7fb40d9b feat(panel plugin): improving panel plugin model 10 éve
index.go 44f0242157 fix(build): fixed issue after merge 10 éve
login.go 201f50b121 Merge branch 'master' into external-plugins 10 éve
login_oauth.go 6488324cf1 enhance quota support. 10 éve
metrics.go 10820f31c2 Changed go package path 11 éve
org.go 4ceab4abc7 fix mismatch api path 10 éve
org_invite.go aa89416bca fix(invite): fixes to org invite stuff, #2630 10 éve
org_users.go a8aab0cb2b Worked on user administration page, a grafana server admin can now add and edit organization roles for any user, #2014 10 éve
password.go c8bc0b3bf8 Lots of work on user password reset, #1456 10 éve
playlist.go 6fc972ab1e feat(playlists): merge sync with RP 10 éve
quota.go 3926226417 fix getting default quota as map[string]int64 10 éve
render.go 059db533d5 HTTP API: grafana /render calls nows with api keys, Fixes #1649 10 éve
search.go c709a28f02 More work on email and notification infra #1456 10 éve
signup.go aa89416bca fix(invite): fixes to org invite stuff, #2630 10 éve
stars.go 3354365177 Api handler refactoring using the wrap and response func/type, fixed small issue in influxdb 0.9 response handling 10 éve
user.go 3354365177 Api handler refactoring using the wrap and response func/type, fixed small issue in influxdb 0.9 response handling 10 éve