justinvdm

index ce13d4e..b7df91d 100644
--- a/diamondash/public/css/dashboard.css
+++ b/diamondash/public/css/dashboard.css
@@ -5866,7 +5866,7 @@ a:hover {
 }
 
 .legend li {
-  width: 230px;
+  width: 275px;
   float: left;

justinvdm

var vumigo = require('vumigo_v01');
var jed = require('jed');

if (typeof api === 'undefined') {
    // testing hook (supplies api when it is not passed in by the real sandbox)
    var api = this.api = new vumigo.dummy_api.DummyApi();
}

var Promise = vumigo.promise.Promise;
var success = vumigo.promise.success;

justinvdm

diff --git a/vumi/transports/mtn_nigeria/tests/test_xml_over_tcp.py b/vumi/transports/mtn_nigeria/tests/test_xml_over_tcp.py
index b61cb96..17998d7 100644
--- a/vumi/transports/mtn_nigeria/tests/test_xml_over_tcp.py
+++ b/vumi/transports/mtn_nigeria/tests/test_xml_over_tcp.py
@@ -124,12 +124,10 @@ class XmlOverTcpClientTestCase(unittest.TestCase, XmlOverTcpClientServerMixin):
     def test_packet_body_serializing(self):
         body = XmlOverTcpClient.serialize_body(
             'DummyPacket',
-            [('requestId', '123456789abcdefg'),
-             ('foo', 1234)])

justinvdm

         name = utils.slugify(name.encode('utf-8'))
         if not self.has_dashboard(name):
-            return self.render_error_response(request, http.NOT_FOUND,
+            return self.render_error_response(
+                request,
+                http.NOT_FOUND,
                 "Dashboard '%s' does not exist" % name)
 
         self.remove_dashboard(name)
@@ -252,35 +276,45 @@ class DiamondashServer(object):

justinvdm

diff --git a/diamondash/widgets/graph/graph.py b/diamondash/widgets/graph/graph.py
index 20fe95c..ef0d596 100644
--- a/diamondash/widgets/graph/graph.py
+++ b/diamondash/widgets/graph/graph.py
@@ -10,7 +10,7 @@ class GraphWidget(DynamicWidget):
         'time_range': '1d',
         'bucket_size': '1h',
         'align_to_start': False,
-        'dotted': True,
+        'dotted': False,

justinvdm

diff --git a/diamondash/backends/base.py b/diamondash/backends/base.py
index cd5051d..9a681be 100644
--- a/diamondash/backends/base.py
+++ b/diamondash/backends/base.py
@@ -12,7 +12,7 @@ class Backend(ConfigMixin):
     def parse_config(cls, config, class_defaults={}):
         """Parses the backend config, altering it where necessary."""
         defaults = class_defaults.get(cls.__CONFIG_TAG, {})
-        config = utils.update_dict(config, cls.__DEFAULTS, defaults)
+        config = utils.add_dicts(config, cls.__DEFAULTS, defaults)

justinvdm

diff --git a/package.json b/package.json
index 1a1edb1..849af43 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,8 @@
     "karma-mocha": "~0.1.0",
     "grunt-karma": "~0.6.2",
     "karma-phantomjs-launcher": "~0.1.0",
-    "grunt-bower-task": "~0.3.2"
+    "grunt-bower-task": "~0.3.2",

justinvdm

diff --git a/go/base/static/bootstrap/css/bootstrap.css b/go/base/static/bootstrap/css/bootstrap.css
deleted file mode 100755
index 21ebf1f..0000000
--- a/go/base/static/bootstrap/css/bootstrap.css
+++ /dev/null
@@ -1,5255 +0,0 @@
-/*!
- * Bootstrap v2.3.1
- *
- * Copyright 2012 Twitter, Inc

justinvdm

diff --git a/go/base/static/js/vendor/backbone-1.0.0.js b/go/base/static/js/vendor/backbone-1.0.0.js
deleted file mode 100644
index 3512d42..0000000
--- a/go/base/static/js/vendor/backbone-1.0.0.js
+++ /dev/null
@@ -1,1571 +0,0 @@
-//     Backbone.js 1.0.0
-
-//     (c) 2010-2013 Jeremy Ashkenas, DocumentCloud Inc.
-//     Backbone may be freely distributed under the MIT license.

justinvdm

diff --git a/diamondash/public/js/vendor.js b/diamondash/public/js/vendor.js
index a8a594c..1c8b944 100644
--- a/diamondash/public/js/vendor.js
+++ b/diamondash/public/js/vendor.js
@@ -13611,7 +13611,7 @@ if ( typeof window === "object" && typeof window.document === "object" ) {
 
 d3 = function() {
   var d3 = {
-    version: "3.3.3"
+    version: "3.3.8"