Torkel Ödegaard
509b37eb91
dependency(): upgraded angularjs to 1.5.1
2016-02-10 10:15:11 +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
Mitsuhiro Tanda
5c7689388d
fix template url for annotation editor
2016-02-10 11:42:59 +09: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
8784be9a14
feat(plugins): made it possible to have relative plugin template urls
2016-02-09 18:17:32 +01: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
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
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
Torkel Ödegaard
82d5d1b003
feat(plugins): working on plugin examples
2016-02-09 09:53:56 +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
Torkel Ödegaard
99a053bbdd
feat(): removed unused routes and minor fixes
2016-02-08 16:57:29 +01:00
Carl Bergquist
a3b6efdbfa
Merge pull request #2883 from mtanda/prometheus_annotation_support
...
Prometheus annotation support
2016-02-08 14:51:59 +01:00
Torkel Ödegaard
3a1dff6636
fix(): karma now works again, broken in last commit
2016-02-08 14:39:57 +01:00
Torkel Ödegaard
cf92011fb9
Merge branch 'master' of github.com:grafana/grafana
2016-02-08 14:35:45 +01:00
Torkel Ödegaard
0106033293
refactor(): removed stuff
2016-02-08 14:35:34 +01:00
Carl Bergquist
4a43cc1df6
Merge pull request #3958 from bergquist/ux_login
...
Login: UX improvements
2016-02-08 13:05:05 +01:00
bergquist
0f52b4397f
feat(login): minor ux improvements
...
make buttons bigger and introduce the login divider.
closes #3698
2016-02-08 11:18:41 +01:00
Torkel Ödegaard
9c0da733e8
Merge branch 'master' of github.com:grafana/grafana
2016-02-08 10:31:36 +01:00
Torkel Ödegaard
de90ad8967
feat(influxdb): escape influxdb tag values, fixes #3950
2016-02-08 10:31:26 +01:00
bergquist
73bed3880f
feat(graph): sets fixed height for right side legend
...
closes #1277
2016-02-08 09:49:53 +01:00
bergquist
edebdb166e
fix(graph): add missing ctrl in variable
2016-02-08 09:24:30 +01:00
Torkel Ödegaard
7f83be3d0d
ux(): mini fix!
2016-02-08 09:06:28 +01:00
Torkel Ödegaard
a5d1e9ee43
fix(singlestat): fix for singlestat background and sparklines, fixes #3955
2016-02-07 18:37:07 +01:00
Torkel Ödegaard
ff4dbea19d
ux(navbar): worked on responsive breakpoints for navbar
2016-02-07 12:28:06 +01:00
Torkel Ödegaard
89ef019b7c
fix(): back to dashboard link fix
2016-02-06 10:32:07 +01:00
Torkel Ödegaard
801129530e
feat(plugins): base clases are now in app/plugins/sdk
2016-02-05 18:08:21 +01:00
bergquist
020277c045
style(panel): fix intendention issue
2016-02-05 15:10:55 +01:00
bergquist
f8b3c0a64c
feat(influxdb): add default interval setting
...
closes #1552
2016-02-05 15:10:33 +01:00
Torkel Ödegaard
853cd16336
fix(search); fixes to dashboard search (using keyboard), and fix for singlestat in snapshot view
2016-02-05 13:48:10 +01:00
Torkel Ödegaard
0fab210ad2
feat(apps): changed edit apps view to use plugin-component for apps config view
2016-02-05 12:13:59 +01:00
Torkel Ödegaard
9fc0a83b83
Merge branch 'master' of github.com:grafana/grafana
2016-02-05 11:08:44 +01:00
Torkel Ödegaard
aa8bd044c5
fix(): various fixes to snapshots
2016-02-05 11:05:47 +01:00
Carl Bergquist
59cb429d2d
Merge pull request #3949 from bergquist/table_panel_thresholds
...
tablepanel: using two thresholds
2016-02-05 10:38:31 +01:00
Torkel Ödegaard
273fbaac68
refactor(): minor changes
2016-02-05 10:37:14 +01:00
bergquist
8ff997594f
fix(tablepanel): change to using two thresholds
...
fixes #3878
2016-02-05 10:30:46 +01:00
