69d2a8f4fa
style change to login page
2014-09-22 12:31:38 +02:00
d584076b93
added github oauth sign in
2014-09-22 11:39:18 +02:00
071ac0dc85
added gravatar
2014-09-22 10:46:38 +02:00
5dfeddf583
Lots of progress on account management
2014-09-21 15:02:06 +02:00
e0dc530e94
Merge branch 'master' of github.com:torkelo/grafana-private into pro
2014-09-21 08:25:54 +02:00
af52b20c4a
Merge branch 'master' of github.com:grafana/grafana
2014-09-21 08:21:31 +02:00
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
639a44d996
accounts progress
2014-09-20 16:55:38 +02:00
4f261389db
changed placement of color selector popup
2014-09-20 16:55:02 +02:00
b56c3eb035
Changed color for warning alert
2014-09-20 13:32:26 +02:00
32036d017e
Account stuff
2014-09-20 12:14:03 +02:00
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
a19a2c70ab
Fixed spelling in config.sample.js
2014-09-20 08:33:16 +02:00
40a491a80b
Annotations: Elasticsearch annotation and field mapping fixes, small changes for PR #830
2014-09-20 08:30:59 +02:00
c65b7d1591
updated
2014-09-19 17:36:52 +02:00
c287405471
Merge branch 'master' of github.com:torkelo/grafana-private into pro
2014-09-19 17:16:34 +02:00
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
10f9022d7c
Support fields from nested objects pulled from Elasticsearch
2014-09-19 14:11:09 +01:00
563dd898c1
Graph: fix for downscaling y-axis format, never downscale when value is zero, Fixes #826
2014-09-19 12:16:00 +02:00
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
fa31fc046e
Merge pull request #823 from beevee/elasticsearch_basic_auth
...
enable withCredentials in elasticsearch basic auth
2014-09-18 15:54:58 +02:00
a68a179c1e
Small improvements to dashboard alerts, less intrusive, do not push down page anymore, Closes #822
2014-09-18 15:07:49 +02:00
77b0d36b55
enable withCredentials in elasticsearch basic auth
2014-09-18 17:50:59 +06:00
e5fd35db34
small progress on adding collaborators
2014-09-18 12:04:03 +02:00
aa47eeffb2
added default default support
2014-09-18 10:16:25 +02:00
df00ac736f
Merge branch 'master' of github.com:torkelo/grafana-private into pro
2014-09-18 09:38:32 +02:00
f2a6fc4d5a
Merge pull request #808 from lento/multiple-stacks
...
add override options to allow multiple stacks
2014-09-18 09:36:48 +02:00
c9501d1119
Merge pull request #820 from jozog/master
...
Handle 'group' graphite method
2014-09-18 09:35:37 +02:00
323ff3d491
Merge pull request #821 from linkslice/master
...
Update playlist.html
2014-09-18 09:35:13 +02:00
98b3126e32
Update playlist.html
2014-09-17 11:04:06 -07:00
88ea524f44
Handle 'group' graphite method
2014-09-17 17:12:43 +02:00
a0ab9113fc
Graph: added percent y-axis format, Closes #818
2014-09-17 15:39:45 +02:00
31398718e5
Workin on login user state
2014-09-17 15:25:19 +02:00
6dae8f44b9
Small fix for favicon
2014-09-17 13:58:32 +02:00
4f798cfe56
Merge branch 'master' of github.com:torkelo/grafana-private into pro
2014-09-17 13:35:19 +02:00
d8ea970f18
Added support for delete dashboard
2014-09-17 13:35:01 +02:00
bba3f3000f
Search: remove dashboard from search result after dashboard deletion, Closes #753
2014-09-17 13:00:35 +02:00
4b382e0faf
Merge branch 'master' of github.com:torkelo/grafana-private into pro
...
Conflicts:
src/css/less/grafana.less
src/test/test-main.js
2014-09-17 09:54:40 +02:00
d40e21a7e0
Chrome: Fix for display issue in chrome beta & chrome canary when entering edit mode, Closes #795
2014-09-17 09:29:51 +02:00
94d2ae2a6a
Merge branch 'master' of github.com:grafana/grafana
2014-09-17 09:06:37 +02:00
3099198e47
Fixed default dashboard grafana logo when using https
2014-09-17 09:03:34 +02:00
48e9b5f4be
Merge pull request #810 from marcusoftnet/“AddingFavIcon”
...
Added a favicon. This will resolve issue #796
2014-09-16 13:38:32 +02:00
430e2e439b
Small fix to schemaUpgrade, Closes #807
2014-09-16 13:32:27 +02:00
81a21c03b2
Merge branch 'favicon'
2014-09-16 13:20:42 +02:00
064a97e734
added favicon, Closes #796
2014-09-16 13:19:52 +02:00
5e9ed95684
Added a favicon. This will resolve issue #796
2014-09-16 17:45:43 +07:00
017d5617a5
Merge pull request #809 from alxrem/master
...
fix typos
2014-09-16 11:12:48 +02:00
26bb2e0193
fix typos
2014-09-16 13:08:28 +04:00
ff91430fcc
added favicons
2014-09-16 08:01:18 +02:00
32a41a8422
add override options to allow multiple stacks
2014-09-15 18:12:20 -07:00
Torkel Ödegaard
Gregory Becker
Alexey Kirpichnikov
Bryan Irvine
Julien Ozog
Marcus Hammarberg
Alexey Remizov
Lorenzo Pierfederici