Torkel Ödegaard 5d4034be5a Merge branch 'develop' of github.com:grafana/grafana into develop		2018-12-11 10:13:57 +01:00
..
admin	upgrade of typescript and tslint and jest (#13223)	2018-09-11 13:48:13 +02:00
alerting	Alert tab fails when datasource method targetContainsTemplate doesnt exist #14274	2018-12-04 15:00:37 +01:00
annotations	fix pending alert annotation tooltip icon	2018-11-15 16:29:58 +01:00
api-keys	updated api keys snapshot	2018-10-31 12:54:30 +01:00
dashboard	Merge pull request #14434 from grafana/14274-reset-search	2018-12-11 09:14:41 +01:00
datasources	fix snapshots	2018-12-05 12:50:14 +01:00
explore	Merge branch 'master' into develop	2018-12-11 10:00:29 +01:00
folders	reverted AddPermissions	2018-10-09 14:50:46 +02:00
manage-dashboards	redux: moved folders to it's own features folder	2018-09-12 09:15:18 +02:00
org	fixed issue with babel plugin proposal class properties that initiated	2018-11-23 13:41:45 +01:00
panel	Merge branch 'master' into develop	2018-12-11 10:00:29 +01:00
playlist	Clarify wording of playlist protip	2018-11-13 14:56:32 +09:00
plugins	Merge branch 'develop' of github.com:grafana/grafana into develop	2018-12-07 15:09:09 +01:00
profile	Trying to reduce the amount of duplication with preferences	2018-11-19 09:16:34 +01:00
teams	UserPicker and TeamPicker should use min-width instead of fixed widths to avoid overflowing form buttons. #14341	2018-12-06 13:46:04 +01:00
templating	Merge branch 'master' into develop	2018-12-11 10:00:29 +01:00
users	Added Loading state on org pages	2018-10-11 11:49:34 +02:00
all.ts	restore user profile preferences	2018-11-13 10:22:02 +01:00