Torkel Ödegaard e5b3f27a30 Merge branch 'apps' %!s(int64=10) %!d(string=hai) anos
..
admin 91139672cc merge with master, conflicts fixed %!s(int64=10) %!d(string=hai) anos
annotations e5b3f27a30 Merge branch 'apps' %!s(int64=10) %!d(string=hai) anos
apps a15984b663 feat(apps): pages work %!s(int64=10) %!d(string=hai) anos
dashboard e5b3f27a30 Merge branch 'apps' %!s(int64=10) %!d(string=hai) anos
dashlinks 9c0141e84e Fixed some broken HTML. %!s(int64=10) %!d(string=hai) anos
datasources ca3405afc5 feat(plugins): moved http settings to directive instad of just ng-include partial %!s(int64=10) %!d(string=hai) anos
org ca3405afc5 feat(plugins): moved http settings to directive instad of just ng-include partial %!s(int64=10) %!d(string=hai) anos
panel 7ae81a2195 feat(plugins): annotations view work again for elasticsearch %!s(int64=10) %!d(string=hai) anos
panellinks 6cf46b1635 refactoring: more moving stuff around %!s(int64=10) %!d(string=hai) anos
playlist cabefa4fff fix(playlist): fix for timespan -> interval %!s(int64=10) %!d(string=hai) anos
profile 030f902ca5 removed redundant labels %!s(int64=10) %!d(string=hai) anos
templating c30c9fbca9 Clarify template option auto interval in tooltip %!s(int64=10) %!d(string=hai) anos
all.js bcaaedf2ff Resurrected nikita-graf's work and added playlistType for future use %!s(int64=10) %!d(string=hai) anos