public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,127 Commits 655 Branches 650 Tags
31ea5f550f2f87fceeb22f34d64594dea6816137
Commit Graph
6127 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
woodsaj f953033ba7 add support for screenshots in plugins. 
Allow plugin creators to include screenshots of their plugin
in action. Primarily for use in Grafana.net info pages.
 2016-02-09 22:36:42 +08:00
Daniel Lee 72415be2db fix(dashboard): fixes when panel repeat with templating removed 
The original panel should clear all the templating variables and
    look like it did before repeat was selected. Fixes #3831. Also
cleans up after a row repeat is removed
 2016-02-09 14:59:24 +01:00
Torkel Ödegaard 9653f43466 fix(): unit tests 2016-02-09 14:41:43 +01:00
Torkel Ödegaard 1acbd5b7d8 :merge branch 'app-pages' 
Conflicts:
	examples/nginx-app/module.js
	examples/nginx-app/partials/stream.html
	examples/nginx-app/plugin.json
 2016-02-09 14:22:08 +01:00
Torkel Ödegaard f0ecbd3878 feat(apps): removed some on hover stuff from sidemenu to make it ready to merge to master 2016-02-09 14:20:41 +01:00
Torkel Ödegaard 9dcfe6dc39 feat(apps): more work on app pages and sidemenu subnav 2016-02-09 14:06:23 +01:00
Torkel Ödegaard 397e4e4766 fix(img): img link on login 2016-02-09 12:20:09 +01:00
Torkel Ödegaard 5b9ed82d29 feat(plugins): working on plugin examples 2016-02-09 12:20:09 +01:00
Torkel Ödegaard 0def04ad34 feat(apps): more progress on app pages 2016-02-09 12:10:59 +01:00
Daniel Lee e9982bb27e Merge pull request #3952 from bergquist/table_html_escape 
Escape html in table panel
 2016-02-09 11:23:10 +01:00
Torkel Ödegaard 18eb9d6076 feat(apps): began work on app pages 2016-02-09 11:17:49 +01:00
bergquist e7ff018487 feat(table): uses lodash to escape html 2016-02-09 11:16:07 +01:00
bergquist 6ba5471bd4 docs(changelog): add html encoding for table panel 2016-02-09 11:16:07 +01:00
bergquist ddb1d0c684 fix(table): escape / chars as well 2016-02-09 11:14:08 +01:00
bergquist 7d89cf228c fix(table): remove html for htmlencoding option 2016-02-09 11:14:08 +01:00
bergquist 5775c0a341 feat(table): remove option to disable html encoding 2016-02-09 11:14:08 +01:00
bergquist d750908e36 feat(table): escape html by default 
closes #3673
 2016-02-09 11:14:08 +01:00
bergquist b1a648608b test(table): rewrite invalid tests 2016-02-09 11:14:08 +01:00
bergquist b7147a8bd2 docs(changelog): add prometheus annotation support 2016-02-09 10:27:43 +01:00
Torkel Ödegaard 82d5d1b003 feat(plugins): working on plugin examples 2016-02-09 09:53:56 +01:00
Carl Bergquist f4e90df406 Merge pull request #3472 from mtanda/prometheus_query_template 
(prometheus) templating by query result
 2016-02-09 08:26:52 +01:00
Mitsuhiro Tanda 2cce057df1 (prometheus) add query result template query 2016-02-09 01:37:43 +09:00
Torkel Ödegaard dea2234b14 Merge branch 'master' of github.com:grafana/grafana 2016-02-08 16:57:41 +01:00
Torkel Ödegaard 99a053bbdd feat(): removed unused routes and minor fixes 2016-02-08 16:57:29 +01:00
bergquist b7fd6bcf7d docs(changelog): add update about fixed height legend 2016-02-08 14:53:29 +01:00
Carl Bergquist a3b6efdbfa Merge pull request #2883 from mtanda/prometheus_annotation_support 
Prometheus annotation support
 2016-02-08 14:51:59 +01:00
Torkel Ödegaard 3a1dff6636 fix(): karma now works again, broken in last commit 2016-02-08 14:39:57 +01:00
Torkel Ödegaard cf92011fb9 Merge branch 'master' of github.com:grafana/grafana 2016-02-08 14:35:45 +01:00
Torkel Ödegaard 0106033293 refactor(): removed stuff 2016-02-08 14:35:34 +01:00
Carl Bergquist 4a43cc1df6 Merge pull request #3958 from bergquist/ux_login 
Login: UX improvements
 2016-02-08 13:05:05 +01:00
bergquist 0f52b4397f feat(login): minor ux improvements 
make buttons bigger and introduce the login divider.

closes #3698
 2016-02-08 11:18:41 +01:00
Torkel Ödegaard 9c0da733e8 Merge branch 'master' of github.com:grafana/grafana 2016-02-08 10:31:36 +01:00
Torkel Ödegaard de90ad8967 feat(influxdb): escape influxdb tag values, fixes #3950 2016-02-08 10:31:26 +01:00
bergquist 2f3d1ec2ef Merge branch 'graph_legend_height' 2016-02-08 10:07:53 +01:00
bergquist 73bed3880f feat(graph): sets fixed height for right side legend 
closes #1277
 2016-02-08 09:49:53 +01:00
bergquist edebdb166e fix(graph): add missing ctrl in variable 2016-02-08 09:24:30 +01:00
Torkel Ödegaard 7f83be3d0d ux(): mini fix! 2016-02-08 09:06:28 +01:00
Torkel Ödegaard 50920b1423 ux(forms): minor upgrade to new form design 2016-02-07 20:05:49 +01:00
Torkel Ödegaard 42b1c8c80d Merge branch 'master' into style-changes-mattttt 2016-02-07 19:47:14 +01:00
Torkel Ödegaard a5d1e9ee43 fix(singlestat): fix for singlestat background and sparklines, fixes #3955 2016-02-07 18:37:07 +01:00
Torkel Ödegaard ff4dbea19d ux(navbar): worked on responsive breakpoints for navbar 2016-02-07 12:28:06 +01:00
Matthew Toback 1bd58bc1c0 Added new file and removed change to .bra.toml 2016-02-06 17:38:36 -05:00
Matthew Toback 21b0945d08 Beginnings of form restyling, nowhere near merge yet 2016-02-06 17:37:33 -05:00
Torkel Ödegaard 89ef019b7c fix(): back to dashboard link fix 2016-02-06 10:32:07 +01:00
Torkel Ödegaard 801129530e feat(plugins): base clases are now in app/plugins/sdk 2016-02-05 18:08:21 +01:00
bergquist 23fa5fa1c7 Merge branch 'influxdb_global_interval' 2016-02-05 15:13:27 +01:00
bergquist 020277c045 style(panel): fix intendention issue 2016-02-05 15:10:55 +01:00
bergquist f8b3c0a64c feat(influxdb): add default interval setting 
closes #1552
 2016-02-05 15:10:33 +01:00
Carl Bergquist d03ae3bfe5 Merge pull request #3944 from doubledutch/github-api-url 
Add github api_url to github auth docs
 2016-02-05 14:13:17 +01:00
bergquist 6f9896c2fe docs(contributing): minor updates to old doc 2016-02-05 13:59:16 +01:00