Commit Graph

2507 Commits

Author SHA1 Message Date
Torkel Ödegaard
3e5223b98d Merge branch 'master' of github.com:torkelo/grafana-private into pro 2015-02-03 09:43:21 +01:00
Torkel Ödegaard
0fe83d5198 minor css tweaks 2015-02-03 09:43:07 +01:00
Torkel Ödegaard
6b6b97c8d8 Minor bug fix for rememeber refresh interval after zooming two or more times, Fixes #1408 2015-02-03 09:27:00 +01:00
Torkel Ödegaard
5c3e366192 Fixed wrong icon class in annotations, broken after recent upgrade of font-awesome, Fixes #1416 2015-02-03 09:18:00 +01:00
Torkel Ödegaard
7fef460fa2 Fix for paths to partials 2015-02-02 22:15:15 +01:00
Torkel Ödegaard
04ec222462 Big refactoring of the way panels are loaded and how they are built using directives, this way feel cleaner and allowed for placing the panel edit box outside the panel-container 2015-02-02 21:59:04 +01:00
Torkel Ödegaard
b67f4dc390 Added stars to search results 2015-02-02 17:17:30 +01:00
Torkel Ödegaard
1e3970c6e5 Worked on dashoard starring and unstarring, added dashboardMeta model 2015-02-02 11:32:00 +01:00
Torkel Ödegaard
66d9c4f1af Fixed share dashboard feature, sharing temp feature is currently removed 2015-02-02 09:45:45 +01:00
Torkel Ödegaard
f424abf87c more markup fixes 2015-02-02 08:59:38 +01:00
Torkel Ödegaard
8a5c91021d Various css and markup fixes for changed css classes 2015-02-02 08:34:54 +01:00
Torkel Ödegaard
26535e163f fixing broken things in the markup for changed css classes 2015-02-01 20:23:52 +01:00
Torkel Ödegaard
cefdd86634 Minor css changes to graph panel & full edito mode 2015-02-01 19:59:53 +01:00
Torkel Ödegaard
56aa8ae6e0 more design work 2015-02-01 19:13:33 +01:00
Torkel Ödegaard
d272b0f56d Merge branch 'new_top_menu_design' into pro
Conflicts:
	src/app/partials/sidemenu.html
2015-02-01 15:46:08 +01:00
Torkel Ödegaard
6bc524dff8 progress on new design 2015-02-01 15:45:11 +01:00
Torkel Ödegaard
496e5bdad9 More progress on new design 2015-02-01 11:56:01 +01:00
Torkel Ödegaard
f00e5936c9 New design work 2015-01-31 18:00:26 +01:00
Torkel Ödegaard
3da90e09d5 Fixed logout link 2015-01-30 15:10:22 +01:00
Torkel Ödegaard
465c72d98e More work on topnav and gf-box redesign 2015-01-30 14:12:16 +01:00
Torkel Ödegaard
59ade61687 dashboard-edit-view -> gf-box and new box design 2015-01-30 12:57:14 +01:00
Torkel Ödegaard
1ddc2e68bf Further progress on new design 2015-01-30 11:34:54 +01:00
Torkel Ödegaard
fcba5a6eeb More progress on new design 2015-01-30 10:25:10 +01:00
Torkel Ödegaard
2f7770b165 Work on new top nav design 2015-01-30 09:47:16 +01:00
Torkel Ödegaard
740709da04 Added disable user sign up feature 2015-01-29 15:46:36 +01:00
Torkel Ödegaard
2feab76a6f Merge branch 'pro' into temp_test 2015-01-29 15:08:53 +01:00
Torkel Ödegaard
3b5c813be7 worked on user frontend state, state like favorites, etc 2015-01-29 12:10:14 +01:00
Torkel Ödegaard
9d0982f2f7 Merge branch 'master' of github.com:torkelo/grafana-private into pro
Conflicts:
	src/app/directives/dashEditLink.js
2015-01-28 14:30:16 +01:00
Torkel Ödegaard
25316cbe0e Fixed broken feature: new dashboard button 2015-01-28 14:25:35 +01:00
Torkel Ödegaard
cf5595bd64 mini fix for submenuEnabled being undefined, when initiating a dashboard with empty model 2015-01-28 14:24:11 +01:00
Torkel Ödegaard
a7a8ea3077 added admin settings view 2015-01-28 11:39:22 +01:00
Torkel Ödegaard
c75e669204 Hide sidemenu links that the user does not have access to 2015-01-28 11:33:12 +01:00
Torkel Ödegaard
1758412a76 Settings fix 2015-01-28 10:54:14 +01:00
Torkel Ödegaard
017eab8dcd Login: only enabled oauth options are now shown on login page 2015-01-28 10:25:53 +01:00
Torkel Ödegaard
7e26d7a4bf Fix to dashboard loading and error handling 2015-01-28 09:58:24 +01:00
Torkel Ödegaard
c6e110100a Just testing a thing 2015-01-27 18:20:12 +01:00
Torkel Ödegaard
4572747bd6 Worked on login remember cookie and redirect after login 2015-01-27 11:59:20 +01:00
Torkel Ödegaard
11b74baf79 Api token -> api key rename 2015-01-27 08:25:52 +01:00
Torkel Ödegaard
c0353ab5d8 Graph: fix for legend show/hide toggle, after hiding requires new data fetch to show, Fixes #1393 2015-01-27 07:56:23 +01:00
Torkel Ödegaard
9fa0a4c973 Dashboard: fixed scroll isssue in firefox after dashboard import, Closes #1391 2015-01-27 07:47:01 +01:00
Torkel Ödegaard
d2f21bc93e Merge branch 'master' into pro 2015-01-26 15:56:39 +01:00
Torkel Ödegaard
a6b0856020 Worked on account update view 2015-01-26 15:42:11 +01:00
Torkel Ödegaard
ab7e2f89fb Corrected the use of POST vs PUT, POST creates something, PUT updates, got them mixed up 2015-01-26 12:57:44 +01:00
Torkel Ödegaard
71ab8d6afc Merge branch 'master' of github.com:torkelo/grafana-private 2015-01-26 12:41:15 +01:00
Torkel Ödegaard
ea5da627af Panel: Different time periods, panels can override dashboard relative time and/or add a time shift, #171, only works for graph panel for now, need feedback for how to do it for singlestat panel 2015-01-26 11:49:18 +01:00
Torkel Ödegaard
1c8ef716a2 Began work on time overrides for panels, to enable different time periods on the same dashboard, #171 2015-01-26 10:57:08 +01:00
Torkel Ödegaard
6fc451da9e Small fix 2015-01-25 14:51:51 +01:00
Torkel Ödegaard
b940f4a97d Timepicker: New option in timepicker (under dashboard settings), to change now to be for example now-1m, usefull when you want to ignore last minute because it contains incomplete data, Closes #1242, Closes #374 2015-01-25 13:45:08 +01:00
Torkel Ödegaard
c2c81e7e6a Graph: Fix for all series tooltip showing series with all null values when Hide Empty option is enabled, Fixes #1359 2015-01-23 11:36:18 +01:00
Torkel Ödegaard
1508d0ac23 TemplatOCing: Fix to allow custom template variables to contain white space, now only splits on ',', Fixes #1363 2015-01-23 10:41:23 +01:00