Merge branch 'master' of github.com:grafana/grafana

karma.conf.js

@@ -24,9 +24,10 @@ module.exports = function(config) {
     logLevel: config.LOG_INFO,
     autoWatch: true,
     browsers: ['PhantomJS'],
-    captureTimeout: 2000,
+    captureTimeout: 20000,
     singleRun: true,
-    autoWatchBatchDelay: 1000,
+    autoWatchBatchDelay: 10000,
+    browserNoActivityTimeout: 60000,
 
   });
 

public/app/plugins/panel/pluginlist/module.html

@@ -22,7 +22,7 @@
 			</div>
 		</div>
 		<div class="pluginlist-item" ng-show="category.list.length === 0">
-			<a class="pluginlist-link pluginlist-link-{{plugin.state}}" href="http://grafana/net/plugins/">
+			<a class="pluginlist-link pluginlist-link-{{plugin.state}}" href="http://grafana.net/plugins/">
 				<span class="pluginlist-none-installed">No additional panels installed. <span class="pluginlist-emphasis">Browse Grafana.net</span></span>
 			</a>
 		</div>

public/sass/pages/_login.scss

@@ -134,7 +134,7 @@
     border-bottom: 1px solid $gray-1;
 
     .login-divider-text {
-      background-color: $dark-3;
+      background-color: $panel-bg;
       color: $gray-2;
       padding: 0 10px;
     }
@@ -192,4 +192,3 @@
     }
   }
 }
-