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
585503f9fb
fix(): renamed plugin.json for wip for new work in progress data source
2016-03-23 13:11:55 +01:00
Torkel Ödegaard
4058c85e2a
fix(): singlestat init
2016-03-23 13:02:37 +01:00
Torkel Ödegaard
b3c073ab6c
feat(panels): more panel refactoring, using events instead of overriding base class methods
2016-03-23 12:50:56 +01:00
Torkel Ödegaard
6a42b95d39
feat(panels): panel refactorings
2016-03-23 11:31:31 +01:00
Matt Toback
30b2a7169f
Form adjustments for app work
2016-03-22 18:41:04 -04:00
Torkel Ödegaard
cb49e11eca
feat(live): panel sdk/api refactorings
2016-03-22 21:27:53 +01:00
Torkel Ödegaard
7366cef1fe
Merge branch 'master' into websocket
2016-03-22 18:33:39 +01:00
Torkel Ödegaard
1854381456
tech(): updated es6-shim, removed es5-shim, no longer needed as we upraded phantomjs to 2.x, also removed es6-promise, dont think we need it
2016-03-22 18:32:08 +01:00
Torkel Ödegaard
8dee54bf5d
feat(live): progress on panel <-> data source communication patterns
2016-03-22 18:21:21 +01:00
bergquist
83b7397398
Revert "feat(influxdb): add support for 0.11.0 tags"
...
This reverts commit b73d196c6b
2016-03-22 16:07:00 +01:00
Matt Toback
04a887dafa
Merge pull request #4447 from grafana/grafana-worldping-tweaks
...
Updated card views to accommodate a 2 column layout at lg breakpoints
2016-03-22 10:33:00 -04:00
Matt Toback
4c5291f941
Updated card views to accommodate a 2 column layout at lg breakpoints
2016-03-22 10:21:47 -04:00
bergquist
b73d196c6b
feat(influxdb): add support for 0.11.0 tags
...
this change is backwards compatible.
closes #4392
2016-03-22 14:35:46 +01:00
Torkel Ödegaard
d0564933a2
Merge branch 'master' into websocket
2016-03-22 10:42:41 +01:00
Torkel Ödegaard
03f91e8d85
fix(panel resize): fixed panel resize drag handling
2016-03-22 10:42:29 +01:00
Torkel Ödegaard
c711fb67c8
Merge branch 'master' into websocket
2016-03-22 10:31:57 +01:00
Torkel Ödegaard
7e6314dcac
Merge branch 'master' of github.com:grafana/grafana
2016-03-22 10:16:01 +01:00
Torkel Ödegaard
10df9dc8c3
feat(plugins): finished app navigation enhancements, closes #4434
2016-03-22 10:15:47 +01:00
bergquist
4110c7ffb0
fix(switchorg): fixes broken redirect when switchin org
2016-03-22 09:25:46 +01:00
utkarshcmu
f6cbbe1e64
Redirect to home when switching orgs
2016-03-21 22:56:46 -07:00
Torkel Ödegaard
56622ee2c6
Merge branch 'master' of github.com:grafana/grafana
2016-03-21 19:07:19 +01:00
Torkel Ödegaard
65c0937741
ux(): app navigation improvements, changes to plugin.json for apps, merged pages with includes section, #4434
2016-03-21 19:07:08 +01:00
Torkel Ödegaard
8498bfd2c2
Merge pull request #4436 from grafana/org-details-improvements
...
Finishing touches
2016-03-21 17:17:59 +01:00
bergquist
90c6b04361
fix(backendsrv): remove invalid check
2016-03-21 12:43:30 +01:00
bergquist
86a274a7ee
feat(backendsrv): improves error response handling
...
datasourceRequests that could not reach the destination threw
invalid errors due to missing property. This fixes gives the user
a better error message.
closes #4428
2016-03-21 12:30:13 +01:00
Torkel Ödegaard
3ea441d1a0
feat(live): tricky
2016-03-21 10:42:10 +01:00
Torkel Ödegaard
273311eed2
ux(graph styles tab): updated forms in graph styles tab
2016-03-20 17:33:30 +01:00
Torkel Ödegaard
06468d6f43
Merge pull request #4368 from simnv/variable-escape
...
Slash escape regex
2016-03-20 11:22:33 +01:00
Torkel Ödegaard
4377e95c99
fix(graph legend): minor correction to last commit
2016-03-20 11:21:06 +01:00
Torkel Ödegaard
f4feb38089
fix(graph): fixed issue with graph and legend to the right in snapshots, closes #4400
2016-03-20 11:17:53 +01:00
Torkel Ödegaard
9c2809a1a4
ux(): button style tweaks, align with grafana.net styles more
2016-03-20 10:31:50 +01:00
simnv
dd5b4a25d1
Slash escaping test
2016-03-20 00:13:48 +06:00
Torkel Ödegaard
73e5c70d80
fix(ux): fixed ux issue in new cards data source list, now handles overflowing urls and titles, fixes #4403
2016-03-19 11:37:40 +01:00
Torkel Ödegaard
6d36641080
fix(text panel): fixed escaping issue with markdown in text panel, fixes #4409
2016-03-19 11:25:19 +01:00
Matt Toback
084ad69c53
Beginngings of style adjustments to support worldPing app
2016-03-18 19:32:50 -04:00
Torkel Ödegaard
1ccde201be
feat(live datasouces): moved from Observable to Subject
2016-03-18 13:52:26 +01:00
