Torkel Ödegaard
|
7a8b3c419b
|
feat(apps): lots of progress
|
2016-01-08 20:57:58 +01:00 |
|
Torkel Ödegaard
|
60e7c6d150
|
Merge branch 'master' into apps
Conflicts:
public/app/partials/sidemenu.html
|
2016-01-08 18:10:53 +01:00 |
|
Torkel Ödegaard
|
a9aaa5ad73
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-01-08 18:01:20 +01:00 |
|
Torkel Ödegaard
|
6c1fee736b
|
feat(sidemenu): improved user dropdown and sidemenu, will be improved further, #3687
|
2016-01-08 17:58:46 +01:00 |
|
Torkel Ödegaard
|
f81d2595f9
|
Merge branch 'sidebar-consolidation' of github.com:nchristus/grafana into sidebar-consolidation
|
2016-01-08 16:29:10 +01:00 |
|
David Keijser
|
1896bd0920
|
Add missing peer dependency: phantomjs
|
2016-01-08 16:27:43 +01:00 |
|
Torkel Ödegaard
|
183f32390c
|
Merge pull request #3683 from mtanda/cloudwatch_reuse_credentials
(cloudwatch) reuse credentials
|
2016-01-08 16:25:27 +01:00 |
|
bergquist
|
455948ad14
|
fix(playlist): fix broken build. unused vars
|
2016-01-08 16:24:35 +01:00 |
|
bergquist
|
0918063c55
|
fix(playlist): move dashboard uri cration to Backend
|
2016-01-08 16:13:49 +01:00 |
|
bergquist
|
22c001c8a6
|
fix(playlist): implement api according to new standard
|
2016-01-08 14:21:30 +01:00 |
|
bergquist
|
d15b0bf4c4
|
fix(playlist): move backend code to ctrl
data loading should be done in the ctrl
|
2016-01-08 13:57:00 +01:00 |
|
bergquist
|
01a910fedc
|
style(playlists): use backendsrv direct
There is no point resolving the playlists in the routes file.
Loading playlists is what the controller is suppose to do
|
2016-01-08 13:33:24 +01:00 |
|
bergquist
|
8c05067f88
|
style(playlist): rename files to match new format
|
2016-01-08 13:25:30 +01:00 |
|
Torkel Ödegaard
|
f67563e9ee
|
feat(apps): moving things around
|
2016-01-08 12:45:12 +01:00 |
|
bergquist
|
d0841919ea
|
docs(plugins): fixes typo
|
2016-01-08 10:55:22 +01:00 |
|
bergquist
|
a23e60ab69
|
docs(plugins): adds plugin page
|
2016-01-08 10:53:39 +01:00 |
|
Carl Bergquist
|
ab30297d02
|
Merge pull request #3679 from volter/colored-bolt
Color the annotation bolt (#3590)
closes #3590
|
2016-01-08 10:51:29 +01:00 |
|
Torkel Ödegaard
|
3362d6bc56
|
Merge branch 'docs-2.6'
|
2016-01-08 10:25:20 +01:00 |
|
Torkel Ödegaard
|
e5f391ab53
|
docs: minor change to docs make file
|
2016-01-08 10:24:58 +01:00 |
|
Torkel Ödegaard
|
19a5e425cf
|
docs: fixed building from source go dependency verison
|
2016-01-08 10:22:57 +01:00 |
|
Torkel Ödegaard
|
69d0e82453
|
Merge branch 'master' into apps
Conflicts:
pkg/services/sqlstore/migrations/migrations.go
|
2016-01-08 10:20:46 +01:00 |
|
Mitsuhiro Tanda
|
f84737d7d4
|
(cloudwatch) reuse credentials
|
2016-01-08 18:13:36 +09:00 |
|
Nick Christus
|
0ee0ea554d
|
sidebar-consolidation: added new org menu to sidebar
|
2016-01-07 22:49:14 -06:00 |
|
Byron
|
40845578c6
|
Fix elasticsearch hourly indexes
|
2016-01-07 14:39:20 -08:00 |
|
Volker Fröhlich
|
f4e22e49b6
|
Color the annotation bolt (#3590)
Makes it easier to distinguish between annotations while
editing and using them; Uses the icon color.
|
2016-01-07 22:28:03 +01:00 |
|
Torkel Ödegaard
|
8a2af9b818
|
Merge branch 'v2.6.x'
|
2016-01-07 22:00:21 +01:00 |
|
Torkel Ödegaard
|
255901ca7c
|
fix(graph panel): fixed bug in typeahead when adding series style override, fixes #3554
|
2016-01-07 21:59:55 +01:00 |
|
Torkel Ödegaard
|
52644bb28a
|
fix(timepicker): fixed recent breaking of datetime picker when swithing from requirejs to systemjs
|
2016-01-07 20:52:48 +01:00 |
|
bergquist
|
7cad3c89d3
|
Merge branch 'hcooper-hover-order'
|
2016-01-07 18:10:42 +01:00 |
|
bergquist
|
bcdddfe4e8
|
style(tooltip): removed comment and extrated sort
|
2016-01-07 18:09:51 +01:00 |
|
bergquist
|
c4ca1444f9
|
Merge branch 'hover-order' of https://github.com/hcooper/grafana into hcooper-hover-order
|
2016-01-07 17:43:04 +01:00 |
|
bergquist
|
f5565d4814
|
docs(changelog): add note about ssl support for mysql
|
2016-01-07 17:39:25 +01:00 |
|
bergquist
|
f20ee6b482
|
Merge branch 'improbable-io-ssl-for-mysql'
|
2016-01-07 17:09:14 +01:00 |
|
bergquist
|
6c8d084664
|
Merge branch 'ssl-for-mysql' of https://github.com/improbable-io/grafana into improbable-io-ssl-for-mysql
|
2016-01-07 17:08:31 +01:00 |
|
Carl Bergquist
|
412e7bcdae
|
Merge pull request #3664 from utkarshcmu/recorded
Improvized dashboard sorting UI
|
2016-01-07 10:19:13 +01:00 |
|
Carl Bergquist
|
3b65fc0107
|
Merge pull request #3665 from utkarshcmu/recorded2
Better heading
|
2016-01-07 10:14:40 +01:00 |
|
bergquist
|
5792a16222
|
fix(plugins): removes warnings for missing folder
Remove warnings when scanning for plugins in the default
catalog data/plugins
closes #3663
|
2016-01-07 08:51:31 +01:00 |
|
utkarshcmu
|
6a9f451091
|
Better heading
|
2016-01-06 22:50:25 -08:00 |
|
utkarshcmu
|
a559d59d80
|
Improvized dashboard sorting
|
2016-01-06 22:13:22 -08:00 |
|
Carl Bergquist
|
de20a8930e
|
Merge pull request #3649 from nikita-graf/playlist-sort
Playlist dashboards sort
|
2016-01-06 13:38:50 +01:00 |
|
bergquist
|
9343b0378d
|
feat(plugins): adds warn log for scanning folders
symlinks outside to plugin folder can cause problems.
This commit makes sure to warn about it in the logs
|
2016-01-06 11:57:17 +01:00 |
|
nikita-graf
|
3fabd2ea1b
|
basic playlist dashboards sort support
|
2016-01-06 02:05:23 +03:00 |
|
bergquist
|
5de69b288f
|
feat(singlestat): make sparkline height dynamic
closes #3553
|
2016-01-05 19:21:12 +01:00 |
|
Carl Bergquist
|
5eea02b17a
|
Merge pull request #3634 from nikita-graf/dashboard-remove-playlist-sync
Playlist improvements
|
2016-01-05 10:07:48 +01:00 |
|
Carl Bergquist
|
5c0812ab6f
|
Merge pull request #3636 from henridf/docs-es-filter-in-template
Docs: add example with filter in ES template
|
2016-01-05 08:58:26 +01:00 |
|
Henri DF
|
5af3fe93f2
|
Docs: add example with filter in ES template
|
2016-01-04 21:48:47 -08:00 |
|
nikita-graf
|
ee400df930
|
remove dashboard from playlist when its destroyed
|
2016-01-05 04:14:39 +03:00 |
|
Carl Bergquist
|
09b8401324
|
Merge pull request #3624 from mtanda/prometheus_link_fix
(prometheus) fix Prometheus link
|
2016-01-04 17:43:55 +01:00 |
|
bergquist
|
be1fb13162
|
feat(playlist): minor ux changes for playlists
|
2016-01-04 15:11:05 +01:00 |
|
bergquist
|
aa83dc15e2
|
feat(playlist): add search result count
|
2016-01-04 14:23:24 +01:00 |
|