public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,355 Commits 655 Branches 650 Tags
19552450fa9706f5ed94de40c33a2fc2c7e7bb0e
Commit Graph
9355 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard bef8cc2d70 Merge branch 'master' into panel_edit_menu_poc 2014-09-24 14:00:55 +02:00
Torkel Ödegaard eaa899e9cf Small fix to fullscreen mode where scrolling would scroll the background dashboard & page header 2014-09-24 14:00:44 +02:00
Torkel Ödegaard 743c95d0f9 small fix to panel menu positioning 2014-09-24 12:45:03 +02:00
Torkel Ödegaard a08cb52ad9 tweaks to new panel menu, now how top area of panel is clickable, and if no title a 5px high area can be clicked, this will enable panels without title which is something I have wanted 2014-09-24 12:41:55 +02:00
Torkel Ödegaard b9604bf3bc Merge branch 'master' into panel_edit_menu_poc 2014-09-24 12:23:04 +02:00
Torkel Ödegaard 978a345ad8 Dashboard: When deleting dashboard show dashboard title in confirmation popup, Closes #860 2014-09-24 12:20:27 +02:00
Torkel Ödegaard d5ffe6acef White theme: Fixes for hidden series legend text and disabled annotations color, Closes #852 2014-09-24 12:14:20 +02:00
Torkel Ödegaard 622c1a1dad small tweak to new panel edit menu 2014-09-24 11:58:02 +02:00
Torkel Ödegaard 79fea549ef Merge branch 'master' into panel_edit_menu_poc 2014-09-24 11:41:25 +02:00
Torkel Ödegaard bce6e75cfa InfluxDB: Fix for bug when saving dashboard where title is the same as slugified url id, Fixes #859 2014-09-24 11:35:08 +02:00
Torkel Ödegaard 34f36fff5c small fix for graphite-web import 2014-09-24 11:17:34 +02:00
Torkel Ödegaard f4e24038fe Import: Fixes to import from json file and import from graphite. Issues was lingering state from previous dashboard. Closes #840, Closes #853 2014-09-24 10:51:20 +02:00
Torkel Ödegaard 81747e1623 Annotations: Fix for annotations not reloaded when switching between 2 dashboards with annotations, Fixes #851 2014-09-24 09:03:04 +02:00
Torkel Ödegaard d6f1c379c0 fixed text editor & scope issue 2014-09-23 22:30:01 +02:00
Torkel Ödegaard 6794260e3f Lots of progress on new panel edit menu, very tricky to get this right but think I am getting close to something that is good and will work long term 2014-09-23 22:10:10 +02:00
Torkel Ödegaard 1be840f19d More wort on panel edit menu 2014-09-23 16:11:31 +02:00
toni-moreno f59bb6461a added shared tooltips to graphs 2014-09-23 13:51:59 +02:00
Torkel Ödegaard bd3bae3af0 another attempt at improving panel edit menu 2014-09-23 10:52:31 +02:00
Torkel Ödegaard 0fbace7285 Row: fix for row editor and scroll pos, Fixes #846 2014-09-23 08:32:04 +02:00
Torkel Ödegaard af8fec941c Graph: Fix for series draw order not being the same after hiding/unhiding series, Fixes #847 2014-09-23 08:18:59 +02:00
Torkel Ödegaard 139791b0d8 Merge branch 'master' into panel_edit_menu_poc 2014-09-22 18:11:52 +02:00
Torkel Ödegaard 7fe76d32d0 updated latest.json v1.8.0 2014-09-22 13:06:52 +02:00
Torkel Ödegaard 352ad3385a Updated changelog and package.json to new version 1.8.0 2014-09-22 12:59:21 +02:00
Torkel Ödegaard 010baad532 Dashboard: fixed init of editable setting, #837 2014-09-22 12:54:02 +02:00
Torkel Ödegaard 69d2a8f4fa style change to login page 2014-09-22 12:31:38 +02:00
Torkel Ödegaard 3bba8b2c26 Github oauth login works 2014-09-22 11:39:40 +02:00
Torkel Ödegaard d584076b93 added github oauth sign in 2014-09-22 11:39:18 +02:00
Torkel Ödegaard b0b77d667c added gravatar 2014-09-22 10:46:56 +02:00
Torkel Ödegaard 071ac0dc85 added gravatar 2014-09-22 10:46:38 +02:00
Torkel Ödegaard ed8f5dbd22 Lots of progress on account management 2014-09-21 15:02:19 +02:00
Torkel Ödegaard 5dfeddf583 Lots of progress on account management 2014-09-21 15:02:06 +02:00
Torkel Ödegaard cd9306df45 Lots of progress on account management 2014-09-21 15:01:59 +02:00
Torkel Ödegaard e0dc530e94 Merge branch 'master' of github.com:torkelo/grafana-private into pro 2014-09-21 08:25:54 +02:00
Torkel Ödegaard af52b20c4a Merge branch 'master' of github.com:grafana/grafana 2014-09-21 08:21:31 +02:00
Torkel Ödegaard e82d171041 Dashboard: when opening search or dashboard settings, click the icon again will now hide the view, Closes #836 2014-09-21 08:19:41 +02:00
Torkel Ödegaard 19a35673fa updated 2014-09-20 16:55:54 +02:00
Torkel Ödegaard 639a44d996 accounts progress 2014-09-20 16:55:38 +02:00
Torkel Ödegaard 4f261389db changed placement of color selector popup 2014-09-20 16:55:02 +02:00
Torkel Ödegaard 6003fee33f Merge branch 'master' into panel_edit_menu_poc 2014-09-20 13:37:02 +02:00
Torkel Ödegaard b56c3eb035 Changed color for warning alert 2014-09-20 13:32:26 +02:00
Torkel Ödegaard 015c929bd7 more account stuff 2014-09-20 13:24:06 +02:00
Torkel Ödegaard 992efda7f6 Account stuff 2014-09-20 12:14:19 +02:00
Torkel Ödegaard 32036d017e Account stuff 2014-09-20 12:14:03 +02:00
Torkel Ödegaard 40ff57d8c4 Account stuff 2014-09-20 12:13:46 +02:00
Torkel Ödegaard cdabe50320 Merge branch 'master' of github.com:torkelo/grafana-pro 
Conflicts:
	grafana
 2014-09-20 08:58:17 +02:00
Torkel Ödegaard c62ee78cba Merge branch 'pro' of github.com:torkelo/grafana-private into pro 
Conflicts:
	src/css/less/grafana.less
	src/test/test-main.js
 2014-09-20 08:57:40 +02:00
Torkel Ödegaard a19a2c70ab Fixed spelling in config.sample.js 2014-09-20 08:33:16 +02:00
Torkel Ödegaard 40a491a80b Annotations: Elasticsearch annotation and field mapping fixes, small changes for PR #830 2014-09-20 08:30:59 +02:00
Torkel Ödegaard a9a06ad51d Working on collaborators 2014-09-19 17:37:18 +02:00
Torkel Ödegaard c65b7d1591 updated 2014-09-19 17:36:52 +02:00