 Torkel Ödegaard
|
b39fbff8fa
|
Merge remote-tracking branch 'origin/pro' into pro
Conflicts:
src/test/test-main.js
|
2014-08-21 11:17:44 +02:00 |
|
|
Torkel Ödegaard
|
5ff15f27b7
|
Merge
|
2014-08-21 11:16:22 +02:00 |
|
|
Torkel Ödegaard
|
baf99e8650
|
Merge branch 'master' of github.com:torkelo/grafana-private into pro
Conflicts:
src/test/test-main.js
|
2014-08-21 11:16:08 +02:00 |
|
|
Torkel Ödegaard
|
1bc8526640
|
Reverted change, default edit tab should be metrics tab
|
2014-08-21 09:29:56 +02:00 |
|
|
Torkel Ödegaard
|
0795af8d42
|
Fix for search result list and double link to dashboard that caused navigation start recursion when unsaved changed dialog was displayed
|
2014-08-21 09:28:51 +02:00 |
|
|
Torkel Ödegaard
|
bd7c045b1c
|
Small fix for dashboard settings dialog controls tab was empty
|
2014-08-21 09:01:04 +02:00 |
|
|
Torkel Ödegaard
|
c6812f569f
|
Small js warning fix for firefox
|
2014-08-21 08:42:09 +02:00 |
|
|
Torkel Ödegaard
|
17ffb167e2
|
Small fixes for firefox
|
2014-08-20 22:34:51 +02:00 |
|
|
Torkel Ödegaard
|
019d077f5a
|
Added missing max-height to search results container
|
2014-08-20 19:56:32 +02:00 |
|
|
Torkel Ödegaard
|
c000f438ae
|
added unit tests for grid thresholds
|
2014-08-20 15:03:10 +02:00 |
|
|
Torkel Ödegaard
|
c0d7ddf1fb
|
Updated changelog with new display styles per series option feature, Closes #425, Closes #700
|
2014-08-20 12:11:14 +02:00 |
|
|
Torkel Ödegaard
|
5bf794e24e
|
Merge branch 'series_style_overrides'
|
2014-08-20 11:48:13 +02:00 |
|
|
Torkel Ödegaard
|
a9cfb160c9
|
Added typeahead to series overrides, #425
|
2014-08-20 11:48:00 +02:00 |
|
|
Torkel Ödegaard
|
468c9a9061
|
Fix for zindex override removal, should restore series order
|
2014-08-20 11:31:40 +02:00 |
|
|
Torkel Ödegaard
|
da1279aa5b
|
Added zindex per series override option, #425
|
2014-08-20 10:50:26 +02:00 |
|
|
Torkel Ödegaard
|
3ec053bea7
|
Moved series override code to TimeSeries
|
2014-08-20 10:27:30 +02:00 |
|
|
Torkel Ödegaard
|
b2f9f81eaf
|
Moved yaxis override from aliasYAxis map to the new seriesOverride array
|
2014-08-20 09:31:22 +02:00 |
|
|
Torkel Ödegaard
|
939e957fda
|
Made regex match work for per series overrides, #425, #700
|
2014-08-20 08:35:17 +02:00 |
|
|
Torkel Ödegaard
|
062fe72030
|
More options can now be set on pre series basis, this is awesome!
|
2014-08-19 17:24:37 +02:00 |
|
|
Torkel Ödegaard
|
cdcbb872d5
|
options per series is starting to work nicely
|
2014-08-19 16:57:33 +02:00 |
|
|
Torkel Ödegaard
|
048763053c
|
Began work on applying per series options to flot options
|
2014-08-19 16:22:27 +02:00 |
|
|
Torkel Ödegaard
|
c6489d9b01
|
Lots of progress on per series overrides
|
2014-08-19 15:22:03 +02:00 |
|
|
Torkel Ödegaard
|
299053f2d5
|
Fix for utc in timepicker, Closes #713
|
2014-08-19 11:12:48 +02:00 |
|
|
Torkel Ödegaard
|
937ac84538
|
Began work on per series style overrides, #425
|
2014-08-18 21:48:01 +02:00 |
|
|
Torkel Ödegaard
|
a64604de6b
|
UI improvements to search result list (larger click are for dashboard title link, plus UI look polish), Closes #709
|
2014-08-18 16:38:04 +02:00 |
|
|
Torkel Ödegaard
|
1a3dac0c17
|
Fix for timepicker dates and tooltip when UTC timzone is selected,
custom date modal is still local time, Closes #277
|
2014-08-18 13:43:26 +02:00 |
|
|
Torkel Ödegaard
|
ffd73e8bfb
|
Fix for graphite queries with glob syntax ([1-9] and ?) that made
the graphite parser / query editor bail and fallback to text edit mode.
|
2014-08-18 12:17:48 +02:00 |
|
|
Torkel Ödegaard
|
27c536b1a1
|
Small fix to 'none' axis formats and zero value when axis tickDecimals is high, Closes #707
|
2014-08-18 09:03:25 +02:00 |
|
|
Torkel Ödegaard
|
631c7adf12
|
updated
|
2014-08-17 12:26:00 +02:00 |
|
|
Torkel Ödegaard
|
dc5973a0f3
|
small css fix for alignment of legend values when shown in table style
|
2014-08-17 11:53:58 +02:00 |
|
|
Torkel Ödegaard
|
34ab1e529b
|
Lots of work on the side menu
|
2014-08-16 21:54:05 +02:00 |
|
|
Torkel Ödegaard
|
b812b1c579
|
Fixed link to playlist docs in readme.md
|
2014-08-16 19:02:50 +02:00 |
|
|
Torkel Ödegaard
|
c892d9d6f6
|
Merge remote-tracking branch 'origin/master' into pro
|
2014-08-16 13:15:02 +02:00 |
|
|
Torkel Ödegaard
|
b89480a284
|
refactored use of localStorage
|
2014-08-16 13:13:26 +02:00 |
|
|
Torkel Ödegaard
|
9951c3825e
|
began work on pro side menu
|
2014-08-16 10:14:31 +02:00 |
|
|
Torkel Ödegaard
|
9ac1f6b26b
|
Merge remote-tracking branch 'origin/move_stuff' into pro
|
2014-08-16 08:56:19 +02:00 |
|
|
Torkel Ödegaard
|
dac4954215
|
merged with oss
|
2014-08-16 08:56:02 +02:00 |
|
|
Torkel Ödegaard
|
5846c71095
|
Changed name of some partials and controllers
|
2014-08-16 08:55:14 +02:00 |
|
|
Torkel Ödegaard
|
142f081d1e
|
fixed small issue with the recent change to the 'none' axis format,
Closes #703
|
2014-08-15 21:31:53 +02:00 |
|
|
Torkel Ödegaard
|
ec2b4f584c
|
some initial work on making it easy to add a custom datasource without modifing the original source, #701, #553
|
2014-08-15 19:12:25 +02:00 |
|
|
Torkel Ödegaard
|
88d991ef45
|
Another angular binding/watcher optimization
|
2014-08-15 17:23:27 +02:00 |
|
|
Torkel Ödegaard
|
dc382a6df7
|
Drag drop binding expression watcher was expensive, removed watcher after first eval, seems to still work
|
2014-08-15 13:35:17 +02:00 |
|
|
Torkel Ödegaard
|
c6e57d64d7
|
moved binding expression for panel width to directive
|
2014-08-15 13:19:11 +02:00 |
|
|
Torkel Ödegaard
|
dc3cd430c8
|
moved binding expression in panels to directive and watchGroup
|
2014-08-15 12:57:12 +02:00 |
|
|
Torkel Ödegaard
|
9848600335
|
Changed panel error icon from ng-show to ng-if
|
2014-08-15 12:09:04 +02:00 |
|
|
Torkel Ödegaard
|
cd79b73cb0
|
moved an expensive binding expression into a directive and a groupWatch
|
2014-08-15 11:15:24 +02:00 |
|
|
Torkel Ödegaard
|
21aa1b43fd
|
Save dropdown and search bindings and scope is now not loaded on dashboard load, small performance improvement
|
2014-08-15 09:35:07 +02:00 |
|
|
Torkel Ödegaard
|
2f3a96f7a7
|
Removed add-panel tab from row editor, only add panels from the row menu now, do not want to ways to do the same thing
|
2014-08-15 08:46:32 +02:00 |
|
|
Torkel Ödegaard
|
b761dcde45
|
Switch from watch to watchCollection for bodyclass directive
|
2014-08-15 08:14:15 +02:00 |
|
|
Torkel Ödegaard
|
b6cdb0f885
|
Moved some expensive bindings from timepicker to controller
|
2014-08-15 08:02:16 +02:00 |
|