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

..

components

feat(invite): more work on invite, basic creation works, added new tab directive from angular-ui and made new tab style, #2353

2015-07-17 09:51:34 +02:00

controllers

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

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

directives

refactor(influxdb): refactoring of PR 2477, added unit tests, #2477

2015-08-10 09:09:39 +02:00

features

Merge branch 'invite'

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

filters

Make template variables work in row titles, #1956

2015-06-11 09:35:59 +02:00

panels

fix(singlestat): fix to handle series with no data points, fixes #2460

2015-08-07 10:03:21 +02:00

partials

feat(invite): lots of work completing the new email template system and css inlineing, converted new_user_invite.html to new system, #2353

2015-08-10 21:24:47 +02:00

plugins/datasource

Merge branch 'influxdb_alias_columns' of https://github.com/thuck/grafana into thuck-influxdb_alias_columns

2015-08-10 09:11:19 +02:00

routes

feat(invite): redesign for pending invite list, added revoke button and link, copy invite also works now, #2353

2015-07-20 14:26:49 +02:00

services

feat(invite): began work on invite users dialog, #2353

2015-07-16 10:44:55 +02:00

app.js

feat(invite): more work on invite, basic creation works, added new tab directive from angular-ui and made new tab style, #2353

2015-07-17 09:51:34 +02:00