Torkel Ödegaard 201f50b121 Merge branch 'master' into external-plugins ...

Conflicts:
	pkg/api/login.go
	public/app/core/routes/all.js
	public/app/core/table_model.ts
	public/app/panels/table/table_model.ts
	public/app/plugins/panels/table/editor.ts
	public/app/plugins/panels/table/table_model.ts

2015-12-14 17:28:57 +01:00

..

cloudwatch

sort metrics and dimensions

2015-12-11 17:56:35 +09:00

dtos

Merge branch 'master' into external-plugins

2015-12-14 17:28:57 +01:00

static

Added custom cache control headers for static content

2015-03-23 18:28:59 -04:00

admin_settings.go

fix(admin settings view): always censor provider_config for system info view, fixes #3268

2015-11-18 15:55:45 +01:00

admin_users.go

fixed gofmt tests

2015-11-16 07:28:38 -08:00

api_test.go

Refactoring, worked on middleware unit tests, and began thinking about api unit tests, #1921

2015-05-01 16:23:36 +02:00

api.go

add ui elements for plugins.

2015-12-04 19:21:33 +08:00

apikey.go

More work on email and notification infra #1456

2015-06-05 11:08:19 +02:00

common.go

Fix wrong metrics counter

2015-06-30 12:52:55 +07:00

dashboard_snapshot.go

clearer errors

2015-07-08 08:55:31 +02:00

dashboard.go

Return correct updated+created timestamps to frontend

2015-11-21 05:03:00 -08:00

dataproxy_test.go

Fix dataproxy_test.go tests

2015-09-10 13:27:49 +00:00

dataproxy.go

refactoring: some minor refactoring and changes to AWS profile PR #3053

2015-10-29 11:44:34 +01:00

datasources.go

Merge branch 'master' into external-plugins

2015-12-14 17:28:57 +01:00

externalplugin.go

implement role access checks on external-plugin routes.

2015-11-27 16:26:30 +08:00

frontendsettings.go

Merge branch 'master' into external-plugins

2015-12-14 17:28:57 +01:00

index.go

add ui elements for plugins.

2015-12-04 19:21:33 +08:00

login_oauth.go

enhance quota support.

2015-09-11 23:17:10 +08:00

login.go

Merge branch 'master' into external-plugins

2015-12-14 17:28:57 +01:00

metrics.go

Changed go package path

2015-02-05 10:37:13 +01:00

org_invite.go

fix(invite): fixes to org invite stuff, #2630

2015-09-01 12:35:06 +02:00

org_users.go

Worked on user administration page, a grafana server admin can now add and edit organization roles for any user, #2014

2015-05-19 11:47:14 +02:00

org.go

feat(organization): added update org address to http api and to org details settings view, closes #2672

2015-09-08 14:22:44 +02:00

password.go

Lots of work on user password reset, #1456

2015-06-08 13:39:02 +02:00

plugin_bundle.go

add pluginBundle backend api methods and SQL storage

2015-12-03 23:43:55 +08:00

quota.go

fix getting default quota as map[string]int64

2015-09-15 20:31:58 +08:00

render.go

HTTP API: grafana /render calls nows with api keys, Fixes #1649

2015-04-08 08:59:12 +02:00

search.go

More work on email and notification infra #1456

2015-06-05 08:15:38 +02:00

signup.go

fix(invite): fixes to org invite stuff, #2630

2015-09-01 12:35:06 +02:00

stars.go

Api handler refactoring using the wrap and response func/type, fixed small issue in influxdb 0.9 response handling

2015-05-20 14:59:38 +02:00

user.go

Api handler refactoring using the wrap and response func/type, fixed small issue in influxdb 0.9 response handling

2015-05-20 14:59:38 +02:00