bergquist
12dfee544f
Merge branch 'master' into playlist_tags
2016-01-27 15:22:16 +01:00
Carl Bergquist
0ea651f1df
Merge pull request #3856 from Gueust/elasticsearc_fix_error
...
Serialize an elasticsearch error previously printed as 'Object'
2016-01-27 15:08:00 +01:00
Torkel Ödegaard
8ed9e2e5cc
Merge pull request #3860 from utkarshcmu/fix-tags
...
Fixed broken tags search
2016-01-26 21:58:20 -05:00
utkarshcmu
a352af5b9f
Fixed broken tags search
2016-01-26 18:48:13 -08:00
bergquist
13d993a836
fix(search): remove old search ctrl
2016-01-26 23:28:06 +01:00
bergquist
f384538959
fix(search): fixes broken esc button in search
2016-01-26 23:18:10 +01:00
Gueust
269583a6a1
Serialize an elasticsearch error previously printed as 'Object'
2016-01-26 23:15:54 +01:00
bergquist
0b05d39804
fix(search): fixes missing tags in result
2016-01-26 23:03:03 +01:00
bergquist
2ca7da06a3
Merge branch 'master' into playlist_tags
2016-01-26 22:36:06 +01:00
bergquist
4b59cee17a
fix(search): add missing ctrl property in view
2016-01-26 21:12:20 +01:00
Daniel Lee
bf817281a5
Merge pull request #3855 from daniellee/docs_singlestat
...
Updates documentation for SingleStat thresholds
2016-01-26 21:07:24 +01:00
Daniel Lee
98982b7a74
docs(singlestat) updates threshold explanation
...
The implementation of thresholds changed after fixing #3248 . Docs
updated to reflect and explain the change.
2016-01-26 21:00:13 +01:00
Daniel Lee
2114cbcf0b
Merge branch 'circleci_npm'
2016-01-26 20:53:25 +01:00
Daniel Lee
979807feee
fix(circleci): deletes node_modules before npm install
2016-01-26 20:52:18 +01:00
bergquist
add7078f66
tech(playlist): convert to typescript
2016-01-26 20:37:44 +01:00
Daniel Lee
ab4d020212
fix(circleci): updates npm before npm install
...
npm for node 4 on circleci is really old. This updates npm and will
hopefully make the build green again.
2016-01-26 20:33:00 +01:00
bergquist
c105a07bab
Merge branch 'playlist_tags'
2016-01-26 17:56:30 +01:00
bergquist
09de46e5ac
tech(search): convert search to typescript
2016-01-26 17:54:19 +01:00
Daniel Lee
be2e2577b8
fixes #3839
...
Uses width set to 800px for invite div instead of position fixed. It
looks the same for desktop and makes the button clickable on smaller
resolutions and mobile. Although it is not really responsive so the
text will be small on mobiles. Better that though than a non-clickable
button.
2016-01-25 22:59:48 +01:00
bergquist
92cba94031
tech(fmt): remove unused code
2016-01-25 22:11:24 +01:00
bergquist
52403ca17e
feat(playlist): add usage statisics
2016-01-25 21:39:45 +01:00
Daniel Lee
5f1fe13530
Merge branch 'jimmyR-master' resolves #3741
2016-01-25 21:16:58 +01:00
jimmyR
d8bb7c3094
resolves #3741 merge conflict
...
After a refactoring the sidemenu-canvas css class disappeared so changed the code from #3741 to use the main-view class instead.
2016-01-25 21:15:54 +01:00
bergquist
1cac6ecedb
tech(docker): update influxdb to use latest
2016-01-25 20:46:15 +01:00
bergquist
40088cd4fe
tech(docker): add elastic fig
2016-01-25 20:30:25 +01:00
bergquist
b939a27a8d
revert f3bc726001bfbc707597bce5fa169b46e992eb7ao
...
This change have caused alot of questions. So we revert
2016-01-25 18:40:28 +01:00
Daniel Lee
70cd9265bf
Merge pull request #3844 from bergquist/negative_single_stat_panel
...
Reduce the amount of thresholds values to two in singlestat panel
2016-01-25 16:44:37 +01:00
bergquist
cd1b2e2841
feat(singlestat): reduce max thresholds to two.
...
closes #3248
2016-01-25 16:27:58 +01:00
bergquist
b0a24ae4aa
tech(singlestat): move singlestat test to plugin
...
and change to typescript
2016-01-25 16:13:45 +01:00
bergquist
42802ac710
tech(singlestat): convert singlestat panel to typescript
2016-01-24 18:56:10 +01:00
bergquist
a85bda13db
tech(docker-dev): update dev docker for graphite
2016-01-24 18:07:42 +01:00
Torkel Ödegaard
1a708da155
Merge pull request #3821 from raintank/apiPlugin
...
merge apiPlugins with appPlugins
2016-01-21 19:42:28 +01:00
Anthony Woods
f94599cd29
merge apiPlugins with appPlugins
2016-01-22 01:15:04 +08:00
Torkel Ödegaard
d9d4e6c82f
Merge pull request #3819 from bobrik/opentsdb-fill-policy
...
Support OpenTSDB 2.2 fill policies, closes #3802
2016-01-21 17:54:32 +01:00
Ivan Babrou
bbfdbaf952
Support OpenTSDB 2.2 fill policies, closes #3802
2016-01-21 16:38:46 +00:00
bergquist
28fabadeae
style: remove empty row
2016-01-21 15:13:06 +01:00
Carl Bergquist
37495dd1c6
Merge pull request #3815 from volter/playlist_sort
...
Fix dashboard sorting in playlists
2016-01-21 15:09:33 +01:00
Volker Fröhlich
e5e8e2021f
Fix dashboard sorting in playlists
2016-01-21 14:58:15 +01:00
bergquist
dfd4fbc566
feat(hooks): improve symlinks script
2016-01-21 14:39:32 +01:00
bergquist
08f02397b6
fix(fileexport): tslint fix
2016-01-21 14:31:20 +01:00
bergquist
d3f90dcfcc
style(fileexport): remove commented code
2016-01-21 14:26:31 +01:00
bergquist
ba65b89bbb
feat(csv export): extract csv export into a new file
2016-01-21 14:22:39 +01:00
Torkel Ödegaard
3d353c7d6d
fix(mixed datasource): fixed issue with mixed data source in optimized build
2016-01-21 13:14:25 +01:00
Torkel Ödegaard
bc05cc4977
fix(phantomjs): another fix for phantomjs rendering, #3804
2016-01-21 12:57:03 +01:00
Torkel Ödegaard
cbb5811d8b
fix(cleanup): removed unused js file
2016-01-21 11:40:04 +01:00
Torkel Ödegaard
6461981aa4
build(): minor change
2016-01-21 11:40:04 +01:00
Carl Bergquist
d13957cb72
Merge pull request #3803 from xadhoom/table_export_csv
...
add export to csv in table panel
2016-01-21 10:33:18 +01:00
Torkel Ödegaard
4a8f82ca9b
fix(image rendering): fixed issue with image rendering, fixes #3804
2016-01-21 10:10:32 +01:00
matteo brancaleoni
cdcc7a7172
add export to csv in table panel
2016-01-21 10:02:23 +01:00
Torkel Ödegaard
f2ce8f266b
Merge pull request #3810 from raintank/apiPlugin
...
ApiPlugin custom header support
2016-01-21 08:32:26 +01:00
