 Torkel Ödegaard
|
1929490deb
|
Renamed filterSrv to timeSrv and made it a service again
|
2014-08-27 16:29:48 +02:00 |
|
|
Torkel Ödegaard
|
bb3b31829f
|
Progress on template editor & new templating features
|
2014-08-27 15:54:30 +02:00 |
|
|
Torkel Ödegaard
|
e0a58dd1fe
|
More work on template editor
|
2014-08-27 10:41:27 +02:00 |
|
|
Torkel Ödegaard
|
7d6e04ac77
|
Small fixes to dasheditor and firefox fixes for search
|
2014-08-27 09:01:50 +02:00 |
|
|
Torkel Ödegaard
|
6502cff8fe
|
Moved search results from fixed dropdown to edit pane
|
2014-08-26 16:42:15 +02:00 |
|
|
Torkel Ödegaard
|
fdffb03eba
|
Css polish and tweaks
|
2014-08-26 15:02:25 +02:00 |
|
|
Torkel Ödegaard
|
d4d3ae7530
|
Dashboard: Fix for zoom out causing right hand to range to be set in the future. Closes #724
|
2014-08-26 14:42:32 +02:00 |
|
|
Torkel Ödegaard
|
647feb7b33
|
Progress on new filter/templating editor
|
2014-08-26 14:17:46 +02:00 |
|
|
Torkel Ödegaard
|
625781c7f4
|
Merge branch 'master' into filtering_overhaul
|
2014-08-26 11:18:30 +02:00 |
|
|
Torkel Ödegaard
|
02ef6c4e07
|
Merge branch 'master' of github.com:grafana/grafana
|
2014-08-26 11:18:08 +02:00 |
|
|
Torkel Ödegaard
|
43eba6cc31
|
Dashboard: fix for hideControls setting not used/initlaized on dashboard load, Closes #723
|
2014-08-26 11:17:56 +02:00 |
|
|
Torkel Ödegaard
|
3775991ac8
|
Modals to edit pane work almost done, need to work on light theme
|
2014-08-26 11:12:26 +02:00 |
|
|
Torkel Ödegaard
|
08d2492839
|
tweaks to edit & tabs look, removed add row from dasheditor
|
2014-08-26 10:49:09 +02:00 |
|
|
Torkel Ödegaard
|
d0d0e8349f
|
moved custom timepicker from modal to edit pane
|
2014-08-26 10:16:21 +02:00 |
|
|
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 |
|