Commit Graph

6095 Commits (1a412378dbbb84112d3512e97da9e6a7c3495ff7)
 

Author SHA1 Message Date
Torkel Ödegaard dfe0e258cd feat(text and css): html partials and css can be loaded via systemjs 9 years ago
Torkel Ödegaard eda23252e1 Merge branch 'master' of github.com:grafana/grafana 9 years ago
Torkel Ödegaard 257b824d4f feat(plugins): better logging and handling of loading plugins, try to create plugins dir if it does not exist, fixes #3974 9 years ago
bergquist b469904c7f fix(login): hide divider if no oath 9 years ago
Torkel Ödegaard 509b37eb91 dependency(): upgraded angularjs to 1.5.1 9 years ago
Torkel Ödegaard 9dac382fbf dependency(): updated go lib go-xorm 9 years ago
Torkel Ödegaard ddbdb54c04 Merge branch 'master' of github.com:grafana/grafana 9 years ago
Torkel Ödegaard 181a671bfb dependency(): upgraded go-sql-driver/mysql, fixes #3969 9 years ago
Torkel Ödegaard 1ce34ed907 Merge pull request #3968 from daniellee/issue3831 9 years ago
Torkel Ödegaard f9e7b14f2c cleanup(): removed old file 9 years ago
Torkel Ödegaard dad394523f fix(build): fixed minor issue in systemjs builder, and added SystemJs cache buster 9 years ago
Torkel Ödegaard 1c50eb345c Merge pull request #3975 from mtanda/prometheus_fix_annotation 9 years ago
Mitsuhiro Tanda 5c7689388d fix template url for annotation editor 9 years ago
Torkel Ödegaard baff9b0267 feat(apps): lots of work making apps easier to develop, module paths are handled automatically 9 years ago
Torkel Ödegaard fe2e6b8a80 feat(apps): began work on support for apps that contain data sources 9 years ago
Torkel Ödegaard fb74ebb4ea :Merge branch 'master' of github.com:grafana/grafana 9 years ago
Torkel Ödegaard 8784be9a14 feat(plugins): made it possible to have relative plugin template urls 9 years ago
Torkel Ödegaard fba3d7cb0f Merge pull request #3970 from raintank/appScreenShots 9 years ago
woodsaj f953033ba7 add support for screenshots in plugins. 9 years ago
Daniel Lee 72415be2db fix(dashboard): fixes when panel repeat with templating removed 9 years ago
Torkel Ödegaard 9653f43466 fix(): unit tests 9 years ago
Torkel Ödegaard 1acbd5b7d8 :merge branch 'app-pages' 9 years ago
Torkel Ödegaard f0ecbd3878 feat(apps): removed some on hover stuff from sidemenu to make it ready to merge to master 9 years ago
Torkel Ödegaard 9dcfe6dc39 feat(apps): more work on app pages and sidemenu subnav 9 years ago
Torkel Ödegaard 397e4e4766 fix(img): img link on login 9 years ago
Torkel Ödegaard 5b9ed82d29 feat(plugins): working on plugin examples 9 years ago
Torkel Ödegaard 0def04ad34 feat(apps): more progress on app pages 9 years ago
Daniel Lee e9982bb27e Merge pull request #3952 from bergquist/table_html_escape 9 years ago
Torkel Ödegaard 18eb9d6076 feat(apps): began work on app pages 9 years ago
bergquist e7ff018487 feat(table): uses lodash to escape html 9 years ago
bergquist 6ba5471bd4 docs(changelog): add html encoding for table panel 9 years ago
bergquist ddb1d0c684 fix(table): escape / chars as well 9 years ago
bergquist 7d89cf228c fix(table): remove html for htmlencoding option 9 years ago
bergquist 5775c0a341 feat(table): remove option to disable html encoding 9 years ago
bergquist d750908e36 feat(table): escape html by default 9 years ago
bergquist b1a648608b test(table): rewrite invalid tests 9 years ago
bergquist b7147a8bd2 docs(changelog): add prometheus annotation support 9 years ago
Torkel Ödegaard 82d5d1b003 feat(plugins): working on plugin examples 9 years ago
Carl Bergquist f4e90df406 Merge pull request #3472 from mtanda/prometheus_query_template 9 years ago
Mitsuhiro Tanda 2cce057df1 (prometheus) add query result template query 9 years ago
Torkel Ödegaard dea2234b14 Merge branch 'master' of github.com:grafana/grafana 9 years ago
Torkel Ödegaard 99a053bbdd feat(): removed unused routes and minor fixes 9 years ago
bergquist b7fd6bcf7d docs(changelog): add update about fixed height legend 9 years ago
Carl Bergquist a3b6efdbfa Merge pull request #2883 from mtanda/prometheus_annotation_support 9 years ago
Torkel Ödegaard 3a1dff6636 fix(): karma now works again, broken in last commit 9 years ago
Torkel Ödegaard cf92011fb9 Merge branch 'master' of github.com:grafana/grafana 9 years ago
Torkel Ödegaard 0106033293 refactor(): removed stuff 9 years ago
Carl Bergquist 4a43cc1df6 Merge pull request #3958 from bergquist/ux_login 9 years ago
bergquist 0f52b4397f feat(login): minor ux improvements 9 years ago
Torkel Ödegaard 9c0da733e8 Merge branch 'master' of github.com:grafana/grafana 9 years ago