utkarshcmu
c3fc340c09
Merge branch 'master' of https://github.com/utkarshcmu/grafana into docs-refac
2016-02-10 23:12:41 -08:00
Trent White
581fb8ebfd
dropdown.less added
2016-02-10 18:14:52 -05:00
Trent White
0fa0b3b256
style changes to forms, icons updates and new buttons
2016-02-10 18:14:26 -05:00
Torkel Ödegaard
3b21e9fcf0
Merge pull request #3991 from utkarshcmu/small-fix
...
Minor html fix
2016-02-10 20:43:41 +01:00
utkarshcmu
4c35c83b84
Minor html fix
2016-02-10 11:13:17 -08:00
Torkel Ödegaard
37c6a1ddf0
feat(app routes): worked on app routes, added unit test, changed Grafana-Context header to start with X to be standard compliant, got cloud saas queries to work via app route feature and header template
2016-02-10 16:43:35 +01:00
Torkel Ödegaard
9c0b89b9b0
Merge branch 'master' of github.com:grafana/grafana
2016-02-10 13:18:13 +01:00
Torkel Ödegaard
ae39ec8585
feat(plugins): changed so that plugins can load css async via util function exposed from app/plugins/sdk
2016-02-10 13:09:39 +01:00
bergquist
e37817285a
docs(readme): declare code as bash
2016-02-10 12:08:04 +01:00
Torkel Ödegaard
dfe0e258cd
feat(text and css): html partials and css can be loaded via systemjs
2016-02-10 11:54:17 +01:00
Torkel Ödegaard
eda23252e1
Merge branch 'master' of github.com:grafana/grafana
2016-02-10 11:03:26 +01:00
Torkel Ödegaard
257b824d4f
feat(plugins): better logging and handling of loading plugins, try to create plugins dir if it does not exist, fixes #3974
2016-02-10 11:03:12 +01:00
bergquist
b469904c7f
fix(login): hide divider if no oath
...
closes #3980
2016-02-10 10:41:43 +01:00
Torkel Ödegaard
509b37eb91
dependency(): upgraded angularjs to 1.5.1
2016-02-10 10:15:11 +01:00
Torkel Ödegaard
9dac382fbf
dependency(): updated go lib go-xorm
2016-02-10 10:09:24 +01:00
Torkel Ödegaard
ddbdb54c04
Merge branch 'master' of github.com:grafana/grafana
2016-02-10 09:57:21 +01:00
Torkel Ödegaard
181a671bfb
dependency(): upgraded go-sql-driver/mysql, fixes #3969
2016-02-10 09:56:58 +01:00
Torkel Ödegaard
1ce34ed907
Merge pull request #3968 from daniellee/issue3831
...
Fixes when panel repeat is removed by clearing the templating variables
2016-02-10 09:41:06 +01:00
Torkel Ödegaard
f9e7b14f2c
cleanup(): removed old file
2016-02-10 08:32:16 +01:00
Torkel Ödegaard
dad394523f
fix(build): fixed minor issue in systemjs builder, and added SystemJs cache buster
2016-02-10 06:50:17 +01:00
Torkel Ödegaard
1c50eb345c
Merge pull request #3975 from mtanda/prometheus_fix_annotation
...
fix template url for prometheus annotation editor
2016-02-10 05:43:14 +01:00
Mitsuhiro Tanda
5c7689388d
fix template url for annotation editor
2016-02-10 11:42:59 +09:00
Torkel Ödegaard
baff9b0267
feat(apps): lots of work making apps easier to develop, module paths are handled automatically
2016-02-09 22:10:36 +01:00
Torkel Ödegaard
fe2e6b8a80
feat(apps): began work on support for apps that contain data sources
2016-02-09 18:37:08 +01:00
Torkel Ödegaard
fb74ebb4ea
:Merge branch 'master' of github.com:grafana/grafana
2016-02-09 18:17:43 +01:00
Torkel Ödegaard
8784be9a14
feat(plugins): made it possible to have relative plugin template urls
2016-02-09 18:17:32 +01:00
Torkel Ödegaard
fba3d7cb0f
Merge pull request #3970 from raintank/appScreenShots
...
add support for screenshots in plugins.
2016-02-09 16:31:28 +01:00
woodsaj
f953033ba7
add support for screenshots in plugins.
...
Allow plugin creators to include screenshots of their plugin
in action. Primarily for use in Grafana.net info pages.
2016-02-09 22:36:42 +08:00
Daniel Lee
72415be2db
fix(dashboard): fixes when panel repeat with templating removed
...
The original panel should clear all the templating variables and
look like it did before repeat was selected. Fixes #3831 . Also
cleans up after a row repeat is removed
2016-02-09 14:59:24 +01:00
Torkel Ödegaard
9653f43466
fix(): unit tests
2016-02-09 14:41:43 +01:00
Torkel Ödegaard
1acbd5b7d8
:merge branch 'app-pages'
...
Conflicts:
examples/nginx-app/module.js
examples/nginx-app/partials/stream.html
examples/nginx-app/plugin.json
2016-02-09 14:22:08 +01:00
Torkel Ödegaard
f0ecbd3878
feat(apps): removed some on hover stuff from sidemenu to make it ready to merge to master
2016-02-09 14:20:41 +01:00
Torkel Ödegaard
9dcfe6dc39
feat(apps): more work on app pages and sidemenu subnav
2016-02-09 14:06:23 +01:00
Torkel Ödegaard
397e4e4766
fix(img): img link on login
2016-02-09 12:20:09 +01:00
Torkel Ödegaard
5b9ed82d29
feat(plugins): working on plugin examples
2016-02-09 12:20:09 +01:00
Torkel Ödegaard
0def04ad34
feat(apps): more progress on app pages
2016-02-09 12:10:59 +01:00
Daniel Lee
e9982bb27e
Merge pull request #3952 from bergquist/table_html_escape
...
Escape html in table panel
2016-02-09 11:23:10 +01:00
Torkel Ödegaard
18eb9d6076
feat(apps): began work on app pages
2016-02-09 11:17:49 +01:00
bergquist
e7ff018487
feat(table): uses lodash to escape html
2016-02-09 11:16:07 +01:00
bergquist
6ba5471bd4
docs(changelog): add html encoding for table panel
2016-02-09 11:16:07 +01:00
bergquist
ddb1d0c684
fix(table): escape / chars as well
2016-02-09 11:14:08 +01:00
bergquist
7d89cf228c
fix(table): remove html for htmlencoding option
2016-02-09 11:14:08 +01:00
bergquist
5775c0a341
feat(table): remove option to disable html encoding
2016-02-09 11:14:08 +01:00
bergquist
d750908e36
feat(table): escape html by default
...
closes #3673
2016-02-09 11:14:08 +01:00
bergquist
b1a648608b
test(table): rewrite invalid tests
2016-02-09 11:14:08 +01:00
bergquist
b7147a8bd2
docs(changelog): add prometheus annotation support
2016-02-09 10:27:43 +01:00
Torkel Ödegaard
82d5d1b003
feat(plugins): working on plugin examples
2016-02-09 09:53:56 +01:00
Carl Bergquist
f4e90df406
Merge pull request #3472 from mtanda/prometheus_query_template
...
(prometheus) templating by query result
2016-02-09 08:26:52 +01:00
Mitsuhiro Tanda
2cce057df1
(prometheus) add query result template query
2016-02-09 01:37:43 +09:00
Torkel Ödegaard
dea2234b14
Merge branch 'master' of github.com:grafana/grafana
2016-02-08 16:57:41 +01:00
