 Torkel Ödegaard
|
1a97f79d54
|
changed playlist modal to edit pane
|
2014-08-26 09:46:15 +02:00 |
|
|
Torkel Ödegaard
|
9fc6c4888f
|
converting more modals to edit panels
|
2014-08-26 09:32:30 +02:00 |
|
|
Torkel Ödegaard
|
f2de18508a
|
More work on removing modals
|
2014-08-26 07:27:43 +02:00 |
|
|
Torkel Ödegaard
|
6342571afe
|
Trying get rid of modals, new better design for dashboard settings and modals
|
2014-08-25 22:39:40 +02:00 |
|
|
Torkel Ödegaard
|
00e5bb61fc
|
Trying out an alternative to modals
|
2014-08-25 17:27:19 +02:00 |
|
|
Torkel Ödegaard
|
b506e7c267
|
fixed submenu in fullscreen mode
|
2014-08-25 16:44:33 +02:00 |
|
|
Torkel Ödegaard
|
061d1262d4
|
Small html markup/css simplification
|
2014-08-25 16:14:47 +02:00 |
|
|
Torkel Ödegaard
|
8b3c89e267
|
Starting work on new templating editor
|
2014-08-25 15:55:42 +02:00 |
|
|
Torkel Ödegaard
|
c634ee81fc
|
Refactoring the pulldown (filtering/annotations), changing the ui slightly
|
2014-08-25 15:36:44 +02:00 |
|
|
Torkel Ödegaard
|
6969a4121c
|
removing pulldowns and simplifying submenu controls code
|
2014-08-25 13:31:31 +02:00 |
|
|
Torkel Ödegaard
|
4f8b2ad245
|
began work on filtering overhaul
|
2014-08-25 12:55:42 +02:00 |
|
|
Torkel Ödegaard
|
03353cb652
|
Merge branch 'famousgarkin-master'
|
2014-08-24 14:46:50 +02:00 |
|
|
Torkel Ödegaard
|
6f80862517
|
Dashboard: new config.js option to change/remove window title prefix from 'Grafana -' to anything, PR #685
|
2014-08-24 14:46:13 +02:00 |
|
|
Torkel Ödegaard
|
edd8d63caf
|
Merge branch 'master' of github.com:famousgarkin/grafana into famousgarkin-master
|
2014-08-24 14:29:35 +02:00 |
|
|
Torkel Ödegaard
|
ffbdea78ee
|
Fix for plot dimension error when resizing window
|
2014-08-23 20:23:33 +02:00 |
|
|
Torkel Ödegaard
|
47a20e6a2f
|
Dashboard: fix for adding rows from dashboard settings modal, Closes #699
|
2014-08-23 10:45:07 +02:00 |
|
|
Torkel Ödegaard
|
c00384ad06
|
work on account registration
|
2014-08-22 18:05:51 +02:00 |
|
|
Torkel Ödegaard
|
31fe471da5
|
working on account registration and more
|
2014-08-22 18:05:37 +02:00 |
|
|
Torkel Ödegaard
|
c684b1ddab
|
dashboard load/save work and began work on register
|
2014-08-22 15:32:42 +02:00 |
|
|
Torkel Ödegaard
|
477f66f56b
|
dashobard load/save work, and began register view
|
2014-08-22 15:32:20 +02:00 |
|
|
Torkel Ödegaard
|
359bca0634
|
save/load dashboard update
|
2014-08-22 13:25:22 +02:00 |
|
|
Torkel Ödegaard
|
8a80623d0c
|
Merged dashboard tag colors feature branch, updated changelog #634
|
2014-08-22 09:40:11 +02:00 |
|
|
Torkel Ödegaard
|
adbe8142b6
|
Merge branch 'dashboard_tag_colors'
|
2014-08-22 09:34:19 +02:00 |
|
|
Torkel Ödegaard
|
3579a18da8
|
Css fix for panel-error position
|
2014-08-22 09:34:05 +02:00 |
|
|
Torkel Ödegaard
|
36882ea2a4
|
More work on dashboard tag colors
|
2014-08-22 09:04:28 +02:00 |
|
|
Torkel Ödegaard
|
3fec2cdfd6
|
Merge branch 'master' into dashboard_tag_colors
|
2014-08-22 07:14:19 +02:00 |
|
|
Torkel Ödegaard
|
07d8b542bf
|
working on rethinkdb stuff
|
2014-08-21 22:09:48 +02:00 |
|
|
Torkel Ödegaard
|
06de80f2a7
|
updated
|
2014-08-21 22:09:26 +02:00 |
|
|
Torkel Ödegaard
|
ef351bb9a3
|
Merge branch 'master' of github.com:torkelo/grafana-private into pro
|
2014-08-21 22:01:32 +02:00 |
|
|
Torkel Ödegaard
|
28de5cbd97
|
Merge branch 'master' of github.com:grafana/grafana
|
2014-08-21 21:59:36 +02:00 |
|
|
Torkel Ödegaard
|
39cdf85788
|
small refactoring for search result and dashboard id/title handling
|
2014-08-21 21:59:23 +02:00 |
|
|
Torkel Ödegaard
|
37e19cee20
|
fixed jshint error
|
2014-08-21 11:18:49 +02:00 |
|
|
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 Odegaard
|
7c3046e011
|
Fix for reloadOnSearch missing on all dashboard routes, caused dashboard to be reloaded when entering/exiting edit mode (settings were lost), related to recent fullscreen/edit state present in url, #672, #425
|
2014-08-21 10:36:18 +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 |
|