bergquist 4646723cbb Merge branch 'custom-github-style-oauth' of https://github.com/kfitzpatrick/grafana into kfitzpatrick-custom-github-style-oauth 9 vuotta sitten
..
avatar 9b30634217 fix(postgres): fixed issue with postgres caused by wrong prefrences table types, dropped table and created it with correct column types, fixes #4558 9 vuotta sitten
cloudwatch 6bd2bb04a7 (cloudwatch) add api gateway metrics/dimensions 9 vuotta sitten
dtos c893e5d241 feat(notifications): add support for default notifications 9 vuotta sitten
live 2e1f26096f feat(grafana_live): more work pushing data to websocket, #4355 9 vuotta sitten
pluginproxy 43ba563a1c fix(logging): change log level to trace for plugin proxy logging call, fixes #5126 9 vuotta sitten
static 4fe72ebf69 feat(macaron): upgrades macaron version 10 vuotta sitten
admin.go da67afa51e Fixed api bugs, stats endpoint working 10 vuotta sitten
admin_users.go f5db9950f8 fixed gofmt tests 10 vuotta sitten
alerting.go 2ca7284a56 tech(notifications): splitt into 3 queries 9 vuotta sitten
api.go d11bc57c37 feat(notifications): make it possible to send test alert notifications 9 vuotta sitten
api_test.go cb8110cd48 Refactoring, worked on middleware unit tests, and began thinking about api unit tests, #1921 10 vuotta sitten
apikey.go f81bde5643 Refactoring some api handlers to use the new Response return object 10 vuotta sitten
app_routes.go e0c6048820 feat(instrumentation): added gauge and http endpoint 9 vuotta sitten
common.go bf1ea560e9 feat(logging): error logging improvements 9 vuotta sitten
dashboard.go b0fe69822a Merge branch 'master' into alerting 9 vuotta sitten
dashboard_snapshot.go 51de894692 fix(snapshots): sets default value for snapshot name 9 vuotta sitten
dataproxy.go c675ffc682 Merge branch 'master' into alerting 9 vuotta sitten
dataproxy_test.go 6e532231dc Fix dataproxy_test.go tests 10 vuotta sitten
datasources.go 1955defc43 fix(api): add missing jsonData field to dto 9 vuotta sitten
frontendsettings.go ef4f5147be Merge branch 'master' into alerting_definitions 9 vuotta sitten
gnetproxy.go 23e0240410 fix(build): removed logging call that caused wrong dependency to be used 9 vuotta sitten
index.go 0b7fa3c19d feat(alerting): minor progress on alert list, #5784 9 vuotta sitten
login.go b4646b6c3a Allow users to use a generic oauth that conforms to the github style. 9 vuotta sitten
login_oauth.go 3b69c8f687 feat(alerting): new design for alert tab with sidemenu 9 vuotta sitten
metrics.go b25cb60259 Merge branch 'new-logger' 9 vuotta sitten
org.go 53f5cb6553 fix(api): org name taken error now returns HTTP status code 409, closes 10 vuotta sitten
org_invite.go aa89416bca fix(invite): fixes to org invite stuff, #2630 10 vuotta sitten
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 vuotta sitten
password.go c8bc0b3bf8 Lots of work on user password reset, #1456 10 vuotta sitten
playlist.go 00dc078311 feat(playlist): render playlists if playlist id is invalid 9 vuotta sitten
playlist_play.go d44325affd feat(apps): progress on app dashboard imports 9 vuotta sitten
plugins.go 7cd663bbe8 feat(import): more import work 9 vuotta sitten
preferences.go ab1048b7ee feat(preferences): theme and home dashbord settings now work work on profile and org settings page 9 vuotta sitten
quota.go 3926226417 fix getting default quota as map[string]int64 10 vuotta sitten
render.go 303cd8a5af [RenderToPng fix] (#4901) 9 vuotta sitten
search.go 35a7a3a52b feat(instrumentation): added some more timers 9 vuotta sitten
signup.go 3fd6ae597d minor spelling corrections 9 vuotta sitten
stars.go 3354365177 Api handler refactoring using the wrap and response func/type, fixed small issue in influxdb 0.9 response handling 10 vuotta sitten
user.go 4038b4d17e Set active org through admin api (#5179) 9 vuotta sitten