woodsaj 0903d5541b Merge branch 'master' of github.com:grafana/grafana into externalPlugin ...

Conflicts:
	pkg/api/api.go
	pkg/api/api_plugin.go
	pkg/api/datasources.go
	pkg/api/frontendsettings.go
	pkg/api/index.go
	pkg/plugins/models.go
	pkg/plugins/plugins.go

2015-12-22 00:23:24 +08:00

..

app

Merge branch 'master' of github.com:grafana/grafana into externalPlugin

2015-12-22 00:23:24 +08:00

dashboards

fix(templating): minor fix to default property name, fixes #3378

2015-12-01 09:01:44 +01:00

emails

feat(signup): progress on new sign up and email verification flow, #2353

2015-08-28 13:45:16 +02:00

fonts

Renamed src directory to public

2015-03-29 12:57:28 +02:00

img

added alerting tab stub and styles

2015-10-10 14:17:07 -04:00

less

fix(less): minor less fix

2015-12-21 16:42:28 +01:00

test

tech(systemjs): merged sync with master, all tests are passing

2015-12-21 16:13:24 +01:00

vendor

tech(systemjs): almost all tests are passing

2015-12-21 16:00:58 +01:00

views

tech(systemjs): working on getting tests to work

2015-12-21 11:10:16 +01:00

robots.txt

add support for robots.txt file

2015-06-15 19:02:38 -04:00