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

..

migrations

feat(invite): worked on pending invitations list, revoke invite now works, #2353

2015-07-20 10:57:39 +02:00

migrator

fix(postgres): Dashboard search is now case insensitive when using Postgres, fixes #1896

2015-08-10 20:25:01 +02:00

sqlutil

Added expire option to dashboard snapshots, #1623

2015-03-26 12:00:52 +01:00

apikey_test.go

Added expire option to dashboard snapshots, #1623

2015-03-26 12:00:52 +01:00

apikey.go

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

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

dashboard_snapshot_test.go

more work on dashboard snapshots

2015-03-21 08:53:16 -04:00

dashboard_snapshot.go

clearer errors

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

dashboard_test.go

More work on email and notification infra #1456

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

dashboard.go

fix(postgres): Dashboard search is now case insensitive when using Postgres, fixes #1896

2015-08-10 20:25:01 +02:00

datasource_test.go

Restored sql integration tests to use in mem sqlite3

2015-04-23 16:21:49 +02:00

datasource.go

Postgres fix update

2015-04-01 08:26:02 +02:00

org_test.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_users.go

feat(invite): handling of existing org user case when inviting, #2353

2015-07-21 12:18:11 +02:00

org.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

shared.go

Changed go package path

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

sqlstore.go

Reworking configuration loading and overriding

2015-04-09 12:16:59 +02:00

sqlstore.goconvey

feat(invite): small progress

2015-07-17 14:42:49 +02:00

star.go

Changed go package path

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

stars_test.go

Fixed gofmt formating, updated precommit hook

2015-03-07 16:37:19 +01:00

stats.go

Added server metrics

2015-03-22 15:14:00 -04:00

tables.go

Began work on real sql schema definitions, and migration engine

2015-01-17 21:40:22 +01:00

temp_user_test.go

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

2015-08-10 13:47:06 +02:00

temp_user.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

user.go

fix(ldap): fix for ldap users with empty email address, fixes #2461

2015-08-07 10:14:36 +02:00