Torkel Ödegaard
|
499bad5f53
|
Merge pull request #4320 from mtanda/templating_fix_on_time_range_change
fix to use variable.refresh flag
|
2016-03-10 07:26:24 +01:00 |
|
Mitsuhiro Tanda
|
df2a23d1a7
|
fix to use variable.refresh flag
|
2016-03-10 13:19:07 +09:00 |
|
Paul Mestemaker
|
d6ecf74db4
|
Update ldap.md
Added clearer language on which versions offer LDAP support.
|
2016-03-09 11:25:42 -08:00 |
|
bergquist
|
6670e6cd29
|
feat(cli): allow redirect for plugin-repo.json
|
2016-03-09 16:10:46 +01:00 |
|
Torkel Ödegaard
|
d8b11adfd5
|
Merge branch 'master' into dashboard-thing
|
2016-03-09 13:11:48 +01:00 |
|
Torkel Ödegaard
|
4a5b753fd8
|
feat(templating): refactoring of the refresh values of #4281
|
2016-03-09 13:10:02 +01:00 |
|
bergquist
|
d9231eb805
|
github(pr_template): minor guide for PRs
|
2016-03-09 12:42:36 +01:00 |
|
Torkel Ödegaard
|
bb1e7f62a0
|
fix(build): updated moment.js to fix systemjs build issue, fixes #4306
|
2016-03-09 12:39:05 +01:00 |
|
bergquist
|
e5ffb2bfd2
|
github(issue_template): minor improvement
|
2016-03-09 12:08:09 +01:00 |
|
bergquist
|
6fff0b3e2a
|
Merge branch 'mtanda-refresh_temp_value_by_time_range_changes'
|
2016-03-09 12:02:02 +01:00 |
|
bergquist
|
f0d1853a66
|
style(templating): tigth-form -> gf-form
|
2016-03-09 11:56:52 +01:00 |
|
bergquist
|
7224728ab8
|
Merge branch 'refresh_temp_value_by_time_range_changes' of https://github.com/mtanda/grafana into mtanda-refresh_temp_value_by_time_range_changes
|
2016-03-09 11:46:49 +01:00 |
|
bergquist
|
ca7c3cc27d
|
docs(changelog): add opentsdb annotations to changelog
|
2016-03-09 11:34:59 +01:00 |
|
Carl Bergquist
|
ac439d83fe
|
Merge pull request #4296 from knowroozi/opentsdb_annotations
add annotations for opentsdb
|
2016-03-09 11:31:05 +01:00 |
|
Torkel Ödegaard
|
c0b92eb5d0
|
fix(jshint): fixed jshint warning
|
2016-03-09 10:31:43 +01:00 |
|
Torkel Ödegaard
|
5599bdf1bc
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-03-09 10:26:11 +01:00 |
|
Torkel Ödegaard
|
de41536046
|
fix(share): fixed checkboxes in share modal, fixes #4301
|
2016-03-09 10:26:00 +01:00 |
|
Torkel Ödegaard
|
30d321998c
|
Merge pull request #4295 from utkarshcmu/nav-fix
Minor nav fix
|
2016-03-09 09:27:38 +01:00 |
|
bergquist
|
59a02ce76a
|
example(plugin.json): add example dashboard file
|
2016-03-08 22:13:40 +01:00 |
|
bergquist
|
2c396d4922
|
example(plugin.json): align example app with latests version
|
2016-03-08 21:50:02 +01:00 |
|
Torkel Ödegaard
|
3191678b14
|
feat(plugins): work on plugins that include dashboards
|
2016-03-08 20:46:25 +01:00 |
|
Torkel Ödegaard
|
7ecf057901
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-03-08 20:28:04 +01:00 |
|
Torkel Ödegaard
|
091726b374
|
feat(plugins): commented out dashboard import list
|
2016-03-08 20:27:40 +01:00 |
|
Torkel Ödegaard
|
dfaa6d8eb9
|
feat(plugins): a lot of work on #4298
|
2016-03-08 18:17:47 +01:00 |
|
Mitsuhiro Tanda
|
aff4bf8f6c
|
minor refactoring
|
2016-03-09 01:47:38 +09:00 |
|
Mitsuhiro Tanda
|
ba1e1532ac
|
change option name more clearly
|
2016-03-09 00:53:43 +09:00 |
|
bergquist
|
ae3bda81c5
|
example(plugin.json): add dashboards array in includes
|
2016-03-08 16:52:48 +01:00 |
|
bergquist
|
0ec747630d
|
examples(plugin.json): add includes info
|
2016-03-08 16:50:33 +01:00 |
|
Kaveh Nowroozi
|
945131ccab
|
add annotations for opentsdb
|
2016-03-08 10:47:36 -05:00 |
|
NickG123
|
f11b4cb481
|
Added a select box to templates that allows template values to be refreshed on refresh
|
2016-03-09 00:40:33 +09:00 |
|
utkarshcmu
|
92c6025390
|
Minor nav fix
|
2016-03-08 07:39:41 -08:00 |
|
Carl Bergquist
|
138c738db9
|
Merge pull request #4294 from utkarshcmu/docs-fix
Fixed some typos in docs
|
2016-03-08 16:30:53 +01:00 |
|
utkarshcmu
|
4fae1958fa
|
Fixed some typos
|
2016-03-08 07:28:25 -08:00 |
|
bergquist
|
fb450385d7
|
docs(github): move markdown files into .github folder
|
2016-03-08 15:56:54 +01:00 |
|
Torkel Ödegaard
|
7b1d827460
|
Merge branch 'master' into dashboard-thing
Conflicts:
public/app/features/datasources/partials/edit.html
|
2016-03-08 15:48:01 +01:00 |
|
Torkel Ödegaard
|
74ebc2d3b0
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-03-08 15:32:15 +01:00 |
|
bergquist
|
95f3e52064
|
feat(cli): use commandline object all the way
|
2016-03-08 14:54:18 +01:00 |
|
bergquist
|
da2b65cd7c
|
feat(editorconfig): add config for go files
|
2016-03-08 14:31:31 +01:00 |
|
bergquist
|
2fcb8b849e
|
style(cli): fixed typos
|
2016-03-08 14:30:25 +01:00 |
|
bergquist
|
d7a72e30c0
|
gofmt
|
2016-03-08 13:29:42 +01:00 |
|
bergquist
|
f397d0ddd7
|
fix(cli): retry download when panicing
Will retry to download plugins once if the zip lib panics.
closes #4068
|
2016-03-08 13:16:58 +01:00 |
|
Torkel Ödegaard
|
db98632078
|
feat(plugins): progress on plugins page
|
2016-03-08 12:31:37 +01:00 |
|
Torkel Ödegaard
|
1509b4cb6e
|
Merge pull request #4291 from utkarshcmu/ds-api
Pulled out the common code
|
2016-03-08 12:03:49 +01:00 |
|
utkarshcmu
|
f20f4d130b
|
Pulled out the common code
|
2016-03-08 02:51:03 -08:00 |
|
Torkel Ödegaard
|
3af4b1ff98
|
Merge pull request #4287 from grafana/raintank-issue4283
refactor how template vars are updated. fixes #4283
|
2016-03-08 11:33:37 +01:00 |
|
Torkel Ödegaard
|
f80c2406a8
|
feat(plugins): remove app bundled plugins from plugins list
|
2016-03-08 11:29:36 +01:00 |
|
Carl Bergquist
|
17006b4539
|
Merge pull request #4290 from utkarshcmu/utkarshcmu-api-docs
Update data_source.md
|
2016-03-08 11:27:21 +01:00 |
|
Utkarsh Bhatnagar
|
e5d400ebb9
|
Update data_source.md
|
2016-03-08 02:19:52 -08:00 |
|
Carl Bergquist
|
f824004e4f
|
Merge pull request #4279 from utkarshcmu/ds-api
Implemented GetDataSourceByName API
|
2016-03-08 11:13:22 +01:00 |
|
bergquist
|
453eebbac8
|
style(graph): convert query options to gf-form
|
2016-03-08 11:08:43 +01:00 |
|