public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,332 Commits 655 Branches 650 Tags
659a01903e3bf6963da17029cd2b4304f5554bd7
Commit Graph
44332 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Torkel Ödegaard c287405471 Merge branch 'master' of github.com:torkelo/grafana-private into pro 2014-09-19 17:16:34 +02:00
Gregory Becker 06ec91c899 Give maximum width & height constraint to tooltip boxes 
Extreme values that go beyond the screen resolution are very likely to be misplaced. This is a simple workaround. A better solution would be to improve the code placing the tooltip and make it handle tooltips containing more content than they can safely display.
 2014-09-19 14:16:53 +01:00
Gregory Becker 10f9022d7c Support fields from nested objects pulled from Elasticsearch 2014-09-19 14:11:09 +01:00
Torkel Ödegaard e78c48620f Trying to improve yaxis precision 2014-09-19 13:24:15 +02:00
Torkel Ödegaard 563dd898c1 Graph: fix for downscaling y-axis format, never downscale when value is zero, Fixes #826 2014-09-19 12:16:00 +02:00
Torkel Ödegaard a97bcc3ca7 Elasticsearch: fix for issue when saving dashboard with title equal to slugified url, would cause the backward compatible fix to delete it, Closes #828 2014-09-19 10:37:43 +02:00
Torkel Ödegaard fa31fc046e Merge pull request #823 from beevee/elasticsearch_basic_auth 
enable withCredentials in elasticsearch basic auth
 2014-09-18 15:54:58 +02:00
Torkel Ödegaard a68a179c1e Small improvements to dashboard alerts, less intrusive, do not push down page anymore, Closes #822 2014-09-18 15:07:49 +02:00
Alexey Kirpichnikov 77b0d36b55 enable withCredentials in elasticsearch basic auth 2014-09-18 17:50:59 +06:00
Torkel Ödegaard 1705734435 updated 2014-09-18 12:04:22 +02:00
Torkel Ödegaard e5fd35db34 small progress on adding collaborators 2014-09-18 12:04:03 +02:00
Torkel Ödegaard 158b708eac Small progress on adding collaborator 2014-09-18 12:03:46 +02:00
Torkel Ödegaard aa47eeffb2 added default default support 2014-09-18 10:16:25 +02:00
Torkel Ödegaard df00ac736f Merge branch 'master' of github.com:torkelo/grafana-private into pro 2014-09-18 09:38:32 +02:00
Torkel Ödegaard f2a6fc4d5a Merge pull request #808 from lento/multiple-stacks 
add override options to allow multiple stacks
 2014-09-18 09:36:48 +02:00
Torkel Ödegaard c9501d1119 Merge pull request #820 from jozog/master 
Handle 'group' graphite method
 2014-09-18 09:35:37 +02:00
Torkel Ödegaard 323ff3d491 Merge pull request #821 from linkslice/master 
Update playlist.html
 2014-09-18 09:35:13 +02:00
Bryan Irvine 98b3126e32 Update playlist.html 2014-09-17 11:04:06 -07:00
Julien Ozog 88ea524f44 Handle 'group' graphite method 2014-09-17 17:12:43 +02:00
Torkel Ödegaard a0ab9113fc Graph: added percent y-axis format, Closes #818 2014-09-17 15:39:45 +02:00
Torkel Ödegaard 31398718e5 Workin on login user state 2014-09-17 15:25:19 +02:00
Torkel Ödegaard 4dfe8b6f69 Working on login user name state 2014-09-17 15:25:07 +02:00
Torkel Ödegaard 6dae8f44b9 Small fix for favicon 2014-09-17 13:58:32 +02:00