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

Conflicts:
	public/app/plugins/panels/table/editor.ts
	public/views/index.html

2015-12-02 18:30:48 +01:00

..

cloudwatch

fix EC2RoleProvider parameter

2015-11-26 16:01:33 +09:00

dtos

Merge branch 'master' into external-plugins

2015-12-02 18:30:48 +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

Merge branch 'externalPlugin' of https://github.com/raintank/grafana into external-plugins

2015-11-19 11:05:27 +01: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

feat(plugins): began work on supporting having plugins outside grafana, for example in grafana data dir, next step is to be able to easily specify what plugins you waant to install

2015-11-19 12:55:13 +01:00

externalplugin.go

feat(external_plugin): lots of refactoring for side menu link extensions and view data, #3185

2015-11-20 09:43:10 +01:00

frontendsettings.go

feat(plugins): made panels work as plugins

2015-11-21 13:46:43 +01:00

index.go

feat(external_plugin): lots of refactoring for side menu link extensions and view data, #3185

2015-11-20 09:43:10 +01:00

login_oauth.go

enhance quota support.

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

login.go

feat(external_plugin): lots of refactoring for side menu link extensions and view data, #3185

2015-11-20 09:43:10 +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

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