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
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
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
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
utkarshcmu
1a39d93b4e
Implemented GetDataSourceByName API
2016-03-08 01:54:10 -08:00
Torkel Ödegaard
6fac471415
feat(templating): fixed failing unit tests in PR #4287
2016-03-08 10:41:20 +01:00
bergquist
252568c91b
fix(graph): type in html
2016-03-08 10:33:38 +01:00
bergquist
8e11f8dc21
feat(graph): add spacing above Series specific overrides
2016-03-08 10:30:38 +01:00
Torkel Ödegaard
2475ca8f9a
fix(templaing): refactoring PR #4283
2016-03-08 09:32:54 +01:00
bergquist
2a18430a45
docs(plugin): add table reponse format for queries
2016-03-08 09:26:31 +01:00
woodsaj
dc4743a392
ensure current template variable is set.
...
- When distributing a dashboard it is often not practical to have
"current" template variable option set. This commit ensures that
for dashboards with no current, it is assigned when the dashboard
loads (assuming refresh on load is set.)
2016-03-08 15:41:24 +08:00
woodsaj
0cb57f52de
refactor how template vars are updated. fixes #4283
...
Use promises to order the updates of variable options so that
parents are always updated before children.
This ensures that we only need to query the datasource once per
variable as variables that depend on other variables will only be
processed once their parent has been.
This commit also ensures that variable options are refreshed if
"refresh_on_load" is true even when query params are used to
set the variable seltion.
2016-03-08 15:03:34 +08:00
Torkel Ödegaard
d2aaa2211e
fix(plugins): fixed failing unit tests, fixes #4280
2016-03-07 21:45:49 +01:00
Torkel Ödegaard
f4666df7da
Merge branch 'master' of github.com:grafana/grafana
2016-03-07 18:04:06 +01:00
Torkel Ödegaard
4cd4ce504d
feat(plugins): worked on markdown support for plugin page, #4275
2016-03-07 18:03:45 +01:00
bergquist
fadfa7cc42
fix(postcss): change sourcemap output folder
2016-03-07 17:52:47 +01:00
bergquist
b912edbbef
feat(grunt): add autoprefix with postcss
...
closes #4250
2016-03-07 17:49:47 +01:00
Torkel Ödegaard
a6c6b00d7e
Merge branch 'master' of github.com:grafana/grafana
2016-03-07 17:26:57 +01:00
Torkel Ödegaard
2a557f67d2
Do not set remember me cookie when days are set to zero
2016-03-07 17:26:31 +01:00
bergquist
1a6af064b0
fix(cli): improve logging when folders does not exists
2016-03-07 16:41:22 +01:00
bergquist
7ef62d28a5
feat(cli): add logging to catch panics
2016-03-07 16:11:28 +01:00
Torkel Ödegaard
b8fb8cdce6
feat(plugins): progress on plugin details page, # 4275
2016-03-07 14:32:16 +01:00
Torkel Ödegaard
135679096b
feat(plugins): progress on plugin details page, # 4275
2016-03-07 14:31:17 +01:00
