Commit Graph

5446 Commits (534bc831739e81b5fe592bcbe21dc8e236f698b7)
 

Author SHA1 Message Date
Torkel Ödegaard 534bc83173 temp work on dynamic directives 9 years ago
Torkel Ödegaard 87f6d7da11 Merge branch 'master' of github.com:grafana/grafana 9 years ago
Torkel Ödegaard cdd341af64 feat(packaging): added Restart=on-failure to systemd service spec file 9 years ago
Torkel Ödegaard f70252f013 Merge pull request #3661 from mtanda/prometheus_fill_null 9 years ago
Torkel Ödegaard ed989ecc8d Merge branch 'master' of github.com:grafana/grafana 9 years ago
Torkel Ödegaard a147015e96 fix(playlists): fixed url in playlist view when using sub url, fixes #3711 9 years ago
Carl Bergquist 8cf7fb7f80 Merge pull request #3712 from schen59/master-schen 9 years ago
Mitsuhiro Tanda c317149a08 add test for prometheus fill null 9 years ago
Mitsuhiro Tanda ff8b25a50a fix, should fill null at end timestamp 9 years ago
Mitsuhiro Tanda afa539368f fill null in Prometheus 9 years ago
Shaofeng Chen dc427d5a2c add get org by name api 9 years ago
Torkel Ödegaard a87b5f757d fix(datasources): minor fix to data sources after apps branch merge 9 years ago
bergquist 4db57cc0bb docs(playlists): add persisted playlists to changelog 9 years ago
Torkel Ödegaard 44f0242157 fix(build): fixed issue after merge 9 years ago
Torkel Ödegaard e5b3f27a30 Merge branch 'apps' 9 years ago
Torkel Ödegaard a15984b663 feat(apps): pages work 9 years ago
Carl Bergquist f7fecdc6de Merge pull request #3655 from grafana/playlist 9 years ago
bergquist cabefa4fff fix(playlist): fix for timespan -> interval 9 years ago
bergquist 1ec97e5199 feat(playlist): shortens urls 9 years ago
bergquist 458d15063d fix(playlist): remove invalid logging 9 years ago
bergquist e8786b0747 feat(playlist): renames timespan to interval 9 years ago
bergquist d0bcd1d87c feat(playlist): move playlistSrv to playlist folder 9 years ago
bergquist c8bd9fd6cc style(playlist): renames variable 9 years ago
Torkel Ödegaard 4c59e48cc2 feat(apps): worked on apps edit view styles 9 years ago
bergquist 85a463faab fix(playlist): remove only parameter to describe 9 years ago
bergquist feca2871eb tests(playlist): adds ctrl test for playlist edit 9 years ago
Torkel Ödegaard 144c703c7b Merge pull request #3703 from mtanda/cloudwatch_seoul 9 years ago
Torkel Ödegaard ae6cae0771 Merge branch 'master' of github.com:grafana/grafana 9 years ago
Torkel Ödegaard 2b99b64ec5 fix(table panel): fixed issue with table panel in optimized builds, closes #3702 9 years ago
Torkel Ödegaard ffe1407217 feat(apps): minor progress 9 years ago
Mitsuhiro Tanda 7d8519f5f0 add seoul region 9 years ago
bergquist b79f04493d style(playlist): abstract DTO creation 9 years ago
bergquist 7e7d9457ea Merge branch 'playlist_relation_table' into playlist 9 years ago
bergquist 07fdf6491c fix(playlist): new url for viewing playlist 9 years ago
bergquist fb4bb7f53e fix(playlist): remove start button from edit page 9 years ago
bergquist 1da1849de6 fix(playlist): fixes broken search filter 9 years ago
bergquist 98dccb8641 feat(playlist): refactor FE to support playlistitems 9 years ago
bergquist 8a38991270 feat(playlist): changes to relation table 9 years ago
Torkel Ödegaard 2fe58461d5 feat(apps): minor fix for images 9 years ago
Torkel Ödegaard 16cd27282f Merge pull request #3686 from keis/phantomjs-dependency 9 years ago
Torkel Ödegaard e081a5c5a0 feat(apps): worked on pinning apps 9 years ago
Carl Bergquist 0ea01f24a8 Merge pull request #3690 from utkarshcmu/recorded3 9 years ago
Torkel Ödegaard 882980ada7 changelog: updated with info about #3635 9 years ago
Torkel Ödegaard 66f7a2be15 Merge branch 'snapshot_annotation' of https://github.com/mtanda/grafana into mtanda-snapshot_annotation 9 years ago
Torkel Ödegaard 908b2d151f Merge pull request #3681 from byronmwong/master 9 years ago
Mitsuhiro Tanda d3bc52278d annotation snapshot fix 9 years ago
Mitsuhiro Tanda 012d1378d4 snapshot annotation 9 years ago
Torkel Ödegaard 4da31291d2 feat(apps): minor progress to apps list 9 years ago
Torkel Ödegaard c1e94e61d0 feat(apps): lots of more work on apps, changed app_plugin to app_settings in order to to confuse the app plugin model (definition) and app org settings 9 years ago
Torkel Ödegaard ab79348af5 feat(plugins): minor fix for external plugins with staticRoot 10 years ago