IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
2,950 Commits 5,454 Branches 554 Tags 1.9 GiB
dcfad7d61b
Commit Graph

2950 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Torkel Ödegaard
4f798cfe56 Merge branch 'master' of github.com:torkelo/grafana-private into pro 2014-09-17 13:35:19 +02:00
Torkel Ödegaard
d8ea970f18 Added support for delete dashboard 2014-09-17 13:35:01 +02:00
Torkel Ödegaard
ecafc7bf8f Added support for delete dashboard 2014-09-17 13:34:42 +02:00
Torkel Ödegaard
bba3f3000f Search: remove dashboard from search result after dashboard deletion, Closes #753 2014-09-17 13:00:35 +02:00
Torkel Ödegaard
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
Torkel Ödegaard
2380a26987 updated 2014-09-17 09:49:28 +02:00
Torkel Ödegaard
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
Torkel Ödegaard
94d2ae2a6a Merge branch 'master' of github.com:grafana/grafana 2014-09-17 09:06:37 +02:00
Torkel Ödegaard
3099198e47 Fixed default dashboard grafana logo when using https 2014-09-17 09:03:34 +02:00
Torkel Ödegaard
48e9b5f4be Merge pull request #810 from marcusoftnet/“AddingFavIcon” 
Added a favicon. This will resolve issue #796
 2014-09-16 13:38:32 +02:00
Torkel Ödegaard
430e2e439b Small fix to schemaUpgrade, Closes #807 2014-09-16 13:32:27 +02:00
Torkel Ödegaard
81a21c03b2 Merge branch 'favicon' 2014-09-16 13:20:42 +02:00
Torkel Odegaard
064a97e734 added favicon, Closes #796 2014-09-16 13:19:52 +02:00
Marcus Hammarberg
5e9ed95684 Added a favicon. This will resolve issue #796 2014-09-16 17:45:43 +07:00
Torkel Ödegaard
017d5617a5 Merge pull request #809 from alxrem/master 
fix typos
 2014-09-16 11:12:48 +02:00
Alexey Remizov
26bb2e0193 fix typos 2014-09-16 13:08:28 +04:00
Torkel Odegaard
ff91430fcc added favicons 2014-09-16 08:01:18 +02:00
Lorenzo Pierfederici
32a41a8422 add override options to allow multiple stacks 2014-09-15 18:12:20 -07:00
Torkel Ödegaard
8b93e20a0b Merge pull request #806 from starshayayord/master 
Disable annoying Google Translate plugin
 2014-09-15 19:15:57 +02:00
starshayayord
92bec31ccb Update index.html 
disable google translate plugin
 2014-09-15 18:51:58 +06:00
Torkel Ödegaard
f133a9de79 Merge branch 'master' of github.com:torkelo/grafana-pro 
Conflicts:
	grafana
 2014-09-13 18:36:40 +02:00
Torkel Ödegaard
9b2476451e Merge branch 'pro' of github.com:torkelo/grafana-private into pro 
Conflicts:
	src/test/test-main.js
 2014-09-13 18:36:17 +02:00
Torkel Ödegaard
b876d193c4 updated 2014-09-13 18:33:52 +02:00
Torkel Ödegaard
3944c37627 patches from master 2014-09-13 18:33:35 +02:00
Torkel Ödegaard
14080d1531 Merge remote-tracking branch 'origin/master' into pro 
Conflicts:
	src/css/less/grafana.less
	src/test/test-main.js
 2014-09-13 18:10:14 +02:00
Torkel Ödegaard
96a0d0aefa fixed changelog 2014-09-13 16:38:01 +02:00
Torkel Ödegaard
15f2b2cf9a Annotations: fixed InfluxDB annotation query, added unit test for annotation query, Fixes #802 2014-09-13 16:19:33 +02:00
Torkel Ödegaard
bf9eaea334 Updated lastest.json 2014-09-12 13:19:17 +02:00
Torkel Ödegaard
7b45a2ec51 Small fix to scripted async dashboard example 2014-09-12 13:15:06 +02:00
Torkel Ödegaard
48eb2083f2 Fix for graphite query letter assignment 2014-09-11 17:25:59 +02:00
Torkel Ödegaard
2c6ea276c1 Fixed small bug in graphite target controller when having variable for single parameter function 2014-09-11 17:19:39 +02:00
Torkel Ödegaard
5a3db0505f Small fix to elasticsearch save error handling 2014-09-11 16:00:59 +02:00