Torkel Ödegaard 696fad702f Merge branch 'v3.0.x' ...

Conflicts:
	public/app/features/templating/templateValuesSrv.js

2016-05-26 14:21:17 +02:00

..

app

Merge branch 'v3.0.x'

2016-05-26 14:21:17 +02:00

dashboards

Set custom type for templating variables (#4941)

2016-05-07 07:58:01 +02:00

emails

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

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

fonts

old grafana wordmark was still showing on login and sidebar (#4972)

2016-05-11 09:08:25 +02:00

img

ux(): added specific fallback logos for plugin depending on type, polished layout selector style

2016-03-17 10:15:16 +01:00

sass

feat(footer): some minor changes to footer to make it look good in light theme, closes #4889

2016-05-24 08:11:28 +02:00

test

Merge branch 'v3.0.x'

2016-05-26 14:21:17 +02:00

vendor

Revert "Revert "Gauges""

2016-04-22 14:55:35 +02:00

views

feat(footer): some minor changes to footer to make it look good in light theme, closes #4889

2016-05-24 08:11:28 +02:00

robots.txt

add support for robots.txt file

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