Torkel Ödegaard cab859a0e4 Merge branch 'master' into preferences 10 lat temu
..
avatar 08f7ccff38 feat(avatar): added server side proxy and cache of gravatar requests 10 lat temu
cloudwatch 1f9f439acb lib(): added simplejson lib 10 lat temu
dtos ab1048b7ee feat(preferences): theme and home dashbord settings now work work on profile and org settings page 10 lat temu
live 2e1f26096f feat(grafana_live): more work pushing data to websocket, #4355 10 lat temu
pluginproxy bd2e1ef67e feat(plugins): fixed failing api test 10 lat temu
static 4fe72ebf69 feat(macaron): upgrades macaron version 10 lat temu
admin.go da67afa51e Fixed api bugs, stats endpoint working 10 lat temu
admin_users.go f5db9950f8 fixed gofmt tests 10 lat temu
api.go ab1048b7ee feat(preferences): theme and home dashbord settings now work work on profile and org settings page 10 lat temu
api_test.go cb8110cd48 Refactoring, worked on middleware unit tests, and began thinking about api unit tests, #1921 10 lat temu
apikey.go f81bde5643 Refactoring some api handlers to use the new Response return object 10 lat temu
app_routes.go 37c6a1ddf0 feat(app routes): worked on app routes, added unit test, changed Grafana-Context header to start with X to be standard compliant, got cloud saas queries to work via app route feature and header template 10 lat temu
common.go bdb67d4909 fix(build): fixed dependency and build issue 10 lat temu
dashboard.go ab1048b7ee feat(preferences): theme and home dashbord settings now work work on profile and org settings page 10 lat temu
dashboard_snapshot.go 0398face05 feat(plugins): dashboard import for data sources is working! #4298 10 lat temu
dataproxy.go e63ff1c762 feat(dataproxy): set flush interval, need a setting for this 10 lat temu
dataproxy_test.go 6e532231dc Fix dataproxy_test.go tests 10 lat temu
datasources.go b7d198793f refactor(): minor refactoring of #4455 10 lat temu
frontendsettings.go a2c6469d41 fix(): A Datasource with null jsonData would make Grafana fail to load page, fixes #4536 10 lat temu
index.go ab1048b7ee feat(preferences): theme and home dashbord settings now work work on profile and org settings page 10 lat temu
login.go 2a557f67d2 Do not set remember me cookie when days are set to zero 10 lat temu
login_oauth.go 6488324cf1 enhance quota support. 10 lat temu
metrics.go 10820f31c2 Changed go package path 11 lat temu
org.go 53f5cb6553 fix(api): org name taken error now returns HTTP status code 409, closes 10 lat temu
org_invite.go aa89416bca fix(invite): fixes to org invite stuff, #2630 10 lat temu
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 lat temu
password.go c8bc0b3bf8 Lots of work on user password reset, #1456 10 lat temu
playlist.go 00dc078311 feat(playlist): render playlists if playlist id is invalid 10 lat temu
playlist_play.go da8782a9d0 remove unused imports 10 lat temu
plugins.go 10df9dc8c3 feat(plugins): finished app navigation enhancements, closes #4434 10 lat temu
preferences.go ab1048b7ee feat(preferences): theme and home dashbord settings now work work on profile and org settings page 10 lat temu
quota.go 3926226417 fix getting default quota as map[string]int64 10 lat temu
render.go 43073da7eb feat(renderer): add timeout for the renderer api 10 lat temu
search.go fbd94fc6ce feat(websockets): inital work on websockets, #4355 10 lat temu
signup.go 3fd6ae597d minor spelling corrections 10 lat temu
stars.go 3354365177 Api handler refactoring using the wrap and response func/type, fixed small issue in influxdb 0.9 response handling 10 lat temu
user.go 3354365177 Api handler refactoring using the wrap and response func/type, fixed small issue in influxdb 0.9 response handling 10 lat temu