Commit Graph

6781 Commits

Author SHA1 Message Date
Torkel Ödegaard
f27ce7e1e4 Merge pull request #4461 from dfwarden/ldap_nested_groups
LDAP Nested Groups
2016-03-28 11:19:28 +02:00
Torkel Ödegaard
91c5515d5b Merge branch 'master' of github.com:grafana/grafana 2016-03-28 11:16:03 +02:00
Torkel Ödegaard
6ab1937ff5 changelog(): comment about possible breaking change with templated dashboards 2016-03-28 11:15:48 +02:00
Torkel Ödegaard
576a490435 Merge pull request #4472 from volter/issue-3728
Solve issue #3728
2016-03-28 11:06:33 +02:00
Torkel Ödegaard
0afa545b06 Merge branch 'master' of github.com:grafana/grafana 2016-03-28 10:34:57 +02:00
Torkel Ödegaard
937cefe824 Merge pull request #4477 from grafana/dashlist-style
add card style css for dashlist panels and remove dark border on dash…
2016-03-28 10:34:49 +02:00
Torkel Ödegaard
896605f838 ux(): minor fix for row menu in pinned sidemenu state 2016-03-28 10:23:36 +02:00
Torkel Ödegaard
250e98837f Merge pull request #4484 from notpeter/CloudWatch-ListExamples
Docs: Examples for listing CloudWatch resources in templates.
2016-03-28 09:39:09 +02:00
Peter Tripp
2cb3505dce Examples for listing CloudWatch resources in templates. 2016-03-27 17:20:33 -07:00
Torkel Ödegaard
73f11fae2e Merge pull request #4483 from utkarshcmu/docs
Fixed some minor typos in docs
2016-03-27 13:42:52 +02:00
utkarshcmu
4ced5bbbc0 Fixed some minor typos in docs 2016-03-26 20:15:36 -07:00
Matt Toback
4421fda877 Merge pull request #4479 from grafana/worldping
Tightened up the bottom padding on playlist headers - distance to bot…
2016-03-25 17:42:39 -04:00
Matt Toback
5407052e0c Tightened up the bottom padding on playlist headers - distance to bottom border 2016-03-25 17:41:31 -04:00
Trent White
90c7943242 backing out card style on dashlist 2016-03-25 12:12:46 -04:00
Trent White
70d536c6c4 add card style css for dashlist panels and remove dark border on dashlist items to match the dropdown dashboard picker list 2016-03-25 11:54:50 -04:00
Torkel Ödegaard
319b934967 fix(): fixed failing test 2016-03-25 15:52:28 +01:00
Torkel Ödegaard
61017fc204 feat(plugins): import all dashboards feature 2016-03-25 15:35:58 +01:00
Torkel Ödegaard
1ff90b713f Merge pull request #4473 from grafana/new-panel-icons
added new icons for default panels
2016-03-25 13:46:23 +01:00
Torkel Ödegaard
7045d06221 Merge pull request #4474 from grafana/worldping-adjustments
Added a new util class for highlight words, proper variables added fo…
2016-03-25 13:44:36 +01:00
Torkel Ödegaard
05cc370c55 feat(plugins): added disable button to app config tab 2016-03-25 13:43:13 +01:00
Torkel Ödegaard
963e202745 fix(): data push fix 2016-03-25 09:40:05 +01:00
Matt
82b1a11820 Added a new util class for highlight words, proper variables added for light and dark 2016-03-24 22:01:33 -04:00
Trent White
694c6e8fd2 added new icons for default panels 2016-03-24 16:14:51 -04:00
Volker Fröhlich
45186255cf Solve issue 3728
Conditionally add a format element to ES annotation queries
2016-03-24 17:58:03 +01:00
bergquist
a531a1709e docs(plugin): add apps page 2016-03-24 11:55:36 +01:00
bergquist
f85a3ad44d docs(plugins): minor improvesments to plugin dev guide 2016-03-24 11:29:11 +01:00
Torkel Ödegaard
ee7afcbe9e ux() some final tweaks 2016-03-23 22:40:48 +01:00
Torkel Ödegaard
b3b63f836a ux(): checkbox v3 with hover style 2016-03-23 22:28:38 +01:00
Torkel Ödegaard
c2ef2ef287 ux(): updated checkbox v3 experiment 2016-03-23 21:18:37 +01:00
Torkel Ödegaard
e65fd45c65 ux(): checkbox experiment 2016-03-23 21:10:06 +01:00
Torkel Ödegaard
32a1d1445c refactor(): trying to move app events away from rootScope 2016-03-23 17:39:10 +01:00
Torkel Ödegaard
35c853e906 feat(plugins): fix for plugin logo to navbar on plugin page, #4452 2016-03-23 16:43:32 +01:00
Torkel Ödegaard
481139772b Merge branch 'master' of github.com:grafana/grafana 2016-03-23 16:38:47 +01:00
Torkel Ödegaard
5dfac9a765 feat(plugins): added plugin logo to navbar on plugin page, #4452 2016-03-23 16:37:58 +01:00
Carl Bergquist
ee92fee212 Merge pull request #4460 from grafana/influxdb
[InfluxDB] Adds support for 0.11.0 tags
2016-03-23 16:12:15 +01:00
Torkel Ödegaard
b06d809364 ux(): changed name again 2016-03-23 15:42:46 +01:00
Torkel Ödegaard
f8fb97d912 ux(): restored natural language input class 2016-03-23 15:41:01 +01:00
bergquist
5f2f4a0897 test(influxdb): remove redundant test 2016-03-23 15:23:14 +01:00
Torkel Ödegaard
b7d198793f refactor(): minor refactoring of #4455 2016-03-23 15:09:48 +01:00
bergquist
991b6eafca tech(influxdb): convert datasource to TS class 2016-03-23 14:45:24 +01:00
bergquist
5b75eea8cf fix(influxdb): remove unused parameter 2016-03-23 14:45:24 +01:00
bergquist
ba48f40d21 feat(influxdb): bases parsing upon query 2016-03-23 14:45:23 +01:00
bergquist
6fafc8dba1 add(influxdb): add support for 0.11.0 tags 2016-03-23 14:45:23 +01:00
bergquist
53312852e9 tests(influxdb): adds tests for influxdb response 2016-03-23 14:45:23 +01:00
Torkel Ödegaard
2d59112c1b Merge pull request #4455 from grafana/g3-app-improvements
Form adjustments for app work
2016-03-23 14:32:42 +01:00
Torkel Ödegaard
637db29fad tech(): updated phantomjs npm package to use phantomjs-prebuilt 2016-03-23 13:26:38 +01:00
David Warden
87aca5bf1b new config option for source of %s in group_search_filter, useful for nested LDAP groups 2016-03-23 08:21:25 -04:00
Torkel Ödegaard
585503f9fb fix(): renamed plugin.json for wip for new work in progress data source 2016-03-23 13:11:55 +01:00
Torkel Ödegaard
19e07a610a tech(): added gorilla dependency 2016-03-23 13:08:09 +01:00
Torkel Ödegaard
4058c85e2a fix(): singlestat init 2016-03-23 13:02:37 +01:00