Carl Bergquist
f7fecdc6de
Merge pull request #3655 from grafana/playlist
...
Persistable playlists
closes #515
closes #1137
2016-01-12 15:20:43 +01:00
bergquist
cabefa4fff
fix(playlist): fix for timespan -> interval
2016-01-12 14:38:14 +01:00
bergquist
1ec97e5199
feat(playlist): shortens urls
2016-01-12 14:36:04 +01:00
bergquist
458d15063d
fix(playlist): remove invalid logging
2016-01-12 14:28:19 +01:00
bergquist
e8786b0747
feat(playlist): renames timespan to interval
2016-01-12 13:56:47 +01:00
bergquist
d0bcd1d87c
feat(playlist): move playlistSrv to playlist folder
2016-01-12 13:44:23 +01:00
bergquist
c8bd9fd6cc
style(playlist): renames variable
2016-01-12 13:42:27 +01:00
bergquist
85a463faab
fix(playlist): remove only parameter to describe
2016-01-12 12:01:27 +01:00
bergquist
feca2871eb
tests(playlist): adds ctrl test for playlist edit
2016-01-12 11:57:16 +01:00
Torkel Ödegaard
144c703c7b
Merge pull request #3703 from mtanda/cloudwatch_seoul
...
(cloudwatch) add seoul region
2016-01-12 10:51:34 +01:00
Torkel Ödegaard
ae6cae0771
Merge branch 'master' of github.com:grafana/grafana
2016-01-12 10:32:49 +01:00
Torkel Ödegaard
2b99b64ec5
fix(table panel): fixed issue with table panel in optimized builds, closes #3702
2016-01-12 10:32:19 +01:00
Mitsuhiro Tanda
7d8519f5f0
add seoul region
2016-01-12 18:15:29 +09:00
bergquist
b79f04493d
style(playlist): abstract DTO creation
2016-01-12 08:36:25 +01:00
bergquist
7e7d9457ea
Merge branch 'playlist_relation_table' into playlist
2016-01-12 08:18:03 +01:00
bergquist
07fdf6491c
fix(playlist): new url for viewing playlist
2016-01-12 08:17:44 +01:00
bergquist
fb4bb7f53e
fix(playlist): remove start button from edit page
2016-01-12 08:17:44 +01:00
bergquist
1da1849de6
fix(playlist): fixes broken search filter
2016-01-12 08:17:44 +01:00
bergquist
98dccb8641
feat(playlist): refactor FE to support playlistitems
2016-01-12 08:17:44 +01:00
bergquist
8a38991270
feat(playlist): changes to relation table
...
Also introduces an abstraction between playlist and dashboard.
This will make it possible to att search, and tag filtering to
playlists without any major refactoring
2016-01-12 08:17:44 +01:00
Torkel Ödegaard
16cd27282f
Merge pull request #3686 from keis/phantomjs-dependency
...
Add missing peer dependency: phantomjs
2016-01-11 18:46:10 +01:00
Carl Bergquist
0ea01f24a8
Merge pull request #3690 from utkarshcmu/recorded3
...
Update playlist.md
2016-01-11 16:56:13 +01:00
Torkel Ödegaard
882980ada7
changelog: updated with info about #3635
2016-01-11 16:39:22 +01:00
Torkel Ödegaard
66f7a2be15
Merge branch 'snapshot_annotation' of https://github.com/mtanda/grafana into mtanda-snapshot_annotation
2016-01-11 16:35:45 +01:00
Torkel Ödegaard
908b2d151f
Merge pull request #3681 from byronmwong/master
...
Fix elasticsearch hourly indexes
2016-01-11 16:29:46 +01:00
Mitsuhiro Tanda
d3bc52278d
annotation snapshot fix
2016-01-11 19:26:48 +09:00
Mitsuhiro Tanda
012d1378d4
snapshot annotation
2016-01-11 19:26:48 +09:00
Utkarsh Bhatnagar
39aca0f038
Update playlist.md
2016-01-08 23:52:51 -08: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
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
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
