Torkel Ödegaard 234d1291f9 Merge branch 'invite' ...

Conflicts:
	public/css/less/gfbox.less
	public/emails/reset_password.html
	public/emails/welcome_on_signup.html

2015-08-11 11:22:43 +02:00

..

dtos

feat(invite): can now add org user with sername again, #2353

2015-08-10 14:03:08 +02:00

static

Added custom cache control headers for static content

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

admin_settings.go

whitespace update per gofmt

2015-05-15 13:25:41 -07:00

admin_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

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

feat(invite): progress on invite feature, #2353

2015-08-10 13:47:06 +02: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

Backend: Load dashboards with capital letters in the dashboard url slug (url id), Fixes #2163

2015-06-19 14:42:55 -04:00

dataproxy_test.go

Fixed dataproxy test

2015-02-28 12:34:51 +01:00

dataproxy.go

fix(data source proxy): clear proxies request from cookies, fixes #2470

2015-08-10 12:11:18 +02:00

datasources.go

Began work on data source test / validation, #1997 & #2043

2015-06-01 12:15:49 +02:00

frontendsettings.go

fix(create org): Anonymous user can no longer create org, Fixes #2227

2015-06-25 17:06:43 +02:00

index.go

refactorin api code for user routes, preparation for admin improvements, #2014

2015-05-18 17:52:23 +02:00

login_oauth.go

Add github organizations support

2015-05-23 17:06:51 +03:00

login.go

feat(ldap): work on reading ldap config from toml file, #1450

2015-07-15 10:08:23 +02:00

metrics.go

Changed go package path

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

org_invite.go

feat(invite): new user invites are now also added to correct org after sign up is completed, #2353

2015-08-11 10:45:03 +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

fix(create org): Anonymous user can no longer create org, Fixes #2227

2015-06-25 17:06:43 +02:00

password.go

Lots of work on user password reset, #1456

2015-06-08 13:39:02 +02: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

Minor api refactoring / code clean up

2015-06-10 10:15:42 +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