Commit Graph

7345 Commits

Author SHA1 Message Date
Carl Bergquist
e4a24e1785 Merge pull request #4969 from peggyl/peggyl/fix-update-checker-typo
Fix typo in error message from update checker
2016-05-10 18:17:09 +02:00
Peggy Li
9b0da20d90 Fix typo in error message from update checker 2016-05-10 16:06:51 +00:00
Torkel Ödegaard
c299b86983 docs(): updated readme 2016-05-10 16:33:05 +02:00
Torkel Ödegaard
56e53d7da2 docs(): update readme dependency section 2016-05-10 16:07:59 +02:00
Torkel Ödegaard
d676840258 docs(): added homebrew info to mac install docs 2016-05-10 16:02:00 +02:00
Torkel Ödegaard
ae66c3f289 fix(influxdb): minor editor display fix 2016-05-10 14:38:11 +02:00
bergquist
5ee1b6ca97 docs(changelog): add note about merged PR 2016-05-10 12:54:25 +02:00
Carl Bergquist
c522341136 Merge pull request #4944 from Gueust/optional_tooltip_ordering
Add optional tooltip ordering (against the development branch)
2016-05-10 12:51:44 +02:00
bergquist
2cebe151f2 Merge branch 'master' into development 2016-05-10 12:40:17 +02:00
Torkel Ödegaard
ecf5b61e86 Update ISSUE_TEMPLATE.md 2016-05-10 11:36:45 +02:00
Richard Hartmann
c01ab63744 ISSUE_TEMPLATE.md: different layout (#4960) 2016-05-10 11:33:33 +02:00
Torkel Ödegaard
72b324c95b fix(go16): fixed hang with go 1.6 by updating sqlite3, fixes #4367 2016-05-10 11:22:06 +02:00
minkikim89
0c5abc491d Update index.md (#4956) 2016-05-10 08:44:18 +02:00
LaszloHont
a5e2e59385 Clarify admin_password (#4948)
Closes #4923
2016-05-09 13:44:11 +02:00
Torkel Ödegaard
040dd91d2e fix(templating): fixed issue with current data source variable value, fixes #4934 2016-05-09 10:17:30 +02:00
Torkel Ödegaard
c6c07599c7 conf(): updated comments in config file, fixes #4933 2016-05-09 09:21:33 +02:00
Peggy Li
04ef25b6ff Set custom type for templating variables (#4941) 2016-05-07 07:58:01 +02:00
Carl Bergquist
05ca7158d6 Merge pull request #4886 from Gueust/contribute_doc
Add documentation on the build system for occasional contributors
2016-05-06 15:04:14 +02:00
Torkel Ödegaard
c7e7a0cd16 fix(singlestat): rerender singlestat and reevaluate thresholds on render, fixes #4920 2016-05-05 10:29:14 +02:00
Utkarsh Bhatnagar
70f7177025 Fixed deleting row bug (#4919) 2016-05-05 09:57:21 +02:00
Mathieu Payeur Levallois
c86cdb1805 opentsdb: apply templating on filters (#4594) 2016-05-04 13:47:05 +02:00
Torkel Ödegaard
bd15534360 fix(singlestat gauge): better font size handling for gauge, now value font size is used as scaling factor, fixes #4876 2016-05-04 11:46:21 +02:00
Carl Bergquist
e30745f19c Merge pull request #4881 from mmckinst/kairosdb_broken_image
fix broken link for kairosdb image
2016-05-04 11:05:05 +02:00
Idan Zalzberg
bca8d6d07b singlestat/module.ts onDataError was calling onDataReceived incorrectly (#4897)
onDataError was calling onDataReceived with {data : []} which breaks at the first line since object has no map function.
The correct form is probably just []
2016-05-04 10:48:01 +02:00
Martin Häger
0764a4313b AWS Elasticsearch Service Dimensions (#4903) 2016-05-04 10:47:35 +02:00
Denny Schäfer
e0ef6dd8d4 Fix changelog formatting for 3.0.0-beta7 (#4905) 2016-05-04 10:47:17 +02:00
bergquist
3d366c2a4c feat(graphs): align forms for line mode checkbox 2016-05-04 10:42:12 +02:00
Carl Bergquist
2018e30366 Merge pull request #4902 from idanz/patch-4
Bring back threshold line mode
2016-05-04 10:39:36 +02:00
fg2it
303cd8a5af [RenderToPng fix] (#4901)
* removing useless code

* fix various minor typo

* don't silence phantomjs timeout and allow more time

* fix gofmt
2016-05-04 09:07:45 +02:00
Idan Zalzberg
2f7af968bf Bring back threshold line mode
Threshold line mode was somehow discarded from the HTML in the ui redesign, this brings it back
2016-05-04 10:04:00 +07:00
Matt Toback
543d247af8 Wrapped the form in a form tag and added a submit, the ng-click shoudl work the same, but now enter works. @torkelo, pls review (#4898) 2016-05-03 21:02:57 +02:00
Jean-Baptiste Lespiau
ca1182e783 Stress the required version of node JS 2016-05-03 19:10:32 +02:00
Jean-Baptiste Lespiau
a34a784b43 Add more documentation on how to contribute
Add more documentation on how to fork the project, and how to
build on changes using grunt
2016-05-03 19:10:31 +02:00
Torkel Ödegaard
3bd4b5ccc6 Merge branch 'master' of github.com:grafana/grafana 2016-05-03 19:00:57 +02:00
Torkel Ödegaard
f4a013946f feat(pluginlist): link in plugin list now goes to app/plugin default nav unless enabled 2016-05-03 19:00:42 +02:00
Matt Toback
d2fd829a58 Update module.html 2016-05-03 12:42:37 -04:00
Torkel Ödegaard
5ffd57695c feat(table): added support for column units overriding style units for table 2016-05-03 11:29:51 +02:00
bergquist
02ae1f79f7 docs(changelog): add node about range to text mappings in singlestat 2016-05-03 10:42:01 +02:00
Torkel Ödegaard
6dc24ab2d7 Merge branch 'master' of github.com:grafana/grafana 2016-05-03 10:25:16 +02:00
Torkel Ödegaard
fe0b7533a1 fix(influxdb): quote number valued tag values, only not quote when operator is > or <, fixes #4885 2016-05-03 10:25:06 +02:00
Utkarsh Bhatnagar
b8d861edc1 Fixed query editor UI for keywords (#4890) 2016-05-03 10:09:03 +02:00
Torkel Ödegaard
de26a17dc7 feat(footer): began work on page footer 2016-05-03 09:00:58 +02:00
Mark McKinstry
37907e4110 fix broken link for kairosdb image 2016-05-02 12:31:39 -04:00
Torkel Ödegaard
152e085310 fix(elasticsearch): minor form fix to elastic query editor 2016-05-02 16:34:07 +02:00
Torkel Ödegaard
372b394f5b Merge branch 'master' of github.com:grafana/grafana 2016-05-02 15:41:20 +02:00
Torkel Ödegaard
3889052c31 docs(): added whats new in v3 guide 2016-05-02 15:35:49 +02:00
Torkel Ödegaard
43182cb1eb updated 2016-05-02 14:49:50 +02:00
bergquist
de5a39f320 Revert "Revert "Merge branch 'utkarshcmu-rangeMaps'""
This reverts commit 58b91befde.
2016-05-02 13:17:57 +02:00
bergquist
58b91befde Revert "Merge branch 'utkarshcmu-rangeMaps'"
This reverts commit 8f976fd980, reversing
changes made to 072f51e300.
2016-05-02 13:15:18 +02:00
bergquist
8f976fd980 Merge branch 'utkarshcmu-rangeMaps' 2016-05-02 13:10:17 +02:00