Commit Graph

6873 Commits

Author SHA1 Message Date
Torkel Ödegaard
8dee54bf5d feat(live): progress on panel <-> data source communication patterns 2016-03-22 18:21:21 +01:00
bergquist
bbc4c361bb fix(npm): updates phantomjs requirement 2016-03-22 17:23:15 +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
Carl Bergquist
7f79024e6a Merge pull request #4440 from utkarshcmu/redirect
Redirect to home when switching orgs
2016-03-22 08:28:39 +01:00
utkarshcmu
f6cbbe1e64 Redirect to home when switching orgs 2016-03-21 22:56:46 -07:00
Torkel Ödegaard
64312ceded ux(): updated http settings view with new checkboxes 2016-03-21 21:36:30 +01:00
Torkel Ödegaard
98206ab49f ux(): created new gf-form-switch directive clean/refactoring 2016-03-21 21:24:06 +01: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
Torkel Ödegaard
7403b94b9d Merge branch 'checkboxv2' of github.com:grafana/grafana into checkboxv2 2016-03-21 14:19:32 +01:00
Torkel Ödegaard
d40cc32393 Merge branch 'master' of github.com:grafana/grafana into checkboxv2 2016-03-21 14:18:05 +01:00
Torkel Ödegaard
fc983f9751 ux(): checkbox v2 tweaks 2016-03-21 14:08:18 +01:00
Torkel Ödegaard
ae255a7adf ux(): new checkbox tweaks 2016-03-21 13:37:56 +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
530b6a5088 ux(): another checkbox design 2016-03-21 11:27:53 +01:00
Torkel Ödegaard
5e52aaac6f ux(): checkbox style test 2016-03-21 11:07:37 +01:00
Torkel Ödegaard
3ea441d1a0 feat(live): tricky 2016-03-21 10:42:10 +01:00
bergquist
14df3c6249 feat(cli): use built in envvar support 2016-03-21 10:11:08 +01:00
bergquist
7f8643efde feat(cli): make all plugin commands subcommands 2016-03-21 10:01:07 +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
5e431149cd feat(preferences): removed unused api prefernce methods, these need to be abstracted more from an http api perpsective, they are too low level for the http api, #4399 2016-03-20 11:54:24 +01:00
Torkel Ödegaard
7023dedc05 feat(preferences): refactoring PR #4399 2016-03-20 11:52:19 +01:00
Torkel Ödegaard
9e98c86ae1 Merge branch 'master' into preferences 2016-03-20 11:27:49 +01:00
Torkel Ödegaard
071237d322 Merge pull request #4399 from utkarshcmu/preferences
Set home dashboard per user per org #3214
2016-03-20 11:25:03 +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
82232e2530 changelog(): added nested ldap group to changelog, #4401 2016-03-20 10:57: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
Torkel Ödegaard
662dbaf8b2 Merge pull request #4420 from grafana/grafana-worldping-tweaks
Beginngings of style adjustments to support worldPing app
2016-03-19 11:10:14 +01:00
Torkel Ödegaard
e63ff1c762 feat(dataproxy): set flush interval, need a setting for this 2016-03-19 11:09:26 +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
bergquist
48a721e259 feat(tslint): remove two space requirements for comments 2016-03-18 13:20:49 +01:00
bergquist
4c7f638f3c fix(datasources): fixes header condition
closes #4402
2016-03-18 09:48:26 +01:00
bergquist
35e53ee511 docs(plugin): add info about enabling apps 2016-03-18 09:48:26 +01:00