justinvdm

diff --git a/go/routing/templates/routing.html b/go/routing/templates/routing.html
index 515ae9e..cf2b87e 100644
--- a/go/routing/templates/routing.html
+++ b/go/routing/templates/routing.html
@@ -28,7 +28,7 @@
           <div class="span4 column-container">
             <span class="title">Routers</span>
             <a href="{% url 'routers:new_router' %}" class="btn btn-primary new">+</a>
-            <div class="column" id="routing-blocks"></div>
+            <div class="column" id="routers"></div>

justinvdm

diff --git a/go/apps/dialogue/view_definition.py b/go/apps/dialogue/view_definition.py
index 000b8aa..ca98492 100644
--- a/go/apps/dialogue/view_definition.py
+++ b/go/apps/dialogue/view_definition.py
@@ -22,7 +22,7 @@ class DialogueEditView(ConversationTemplateView):
 
         if r.status_code != 200:
             raise GoApiError(
-                "Failed to load routing table from Go API:"
+                "Failed to load dialogue from Go API:"

justinvdm

diff --git a/go/base/static/js/src/components/tables.js b/go/base/static/js/src/components/tables.js
index 5d3c698..8bad50b 100644
--- a/go/base/static/js/src/components/tables.js
+++ b/go/base/static/js/src/components/tables.js
@@ -91,6 +91,9 @@
         this.refreshButtons();
       },
 
+      // the `td` that houses the checkbox is clickable, this make the
+      // checkbox easier to click because it increases the target

justinvdm

diff --git a/go/base/static/js/test/tests/apps/dialogue/states/states.test.js b/go/base/static/js/test/tests/apps/dialogue/states/states.test.js
index 0f37b12..72f889b 100644
--- a/go/base/static/js/test/tests/apps/dialogue/states/states.test.js
+++ b/go/base/static/js/test/tests/apps/dialogue/states/states.test.js
@@ -481,7 +481,7 @@ describe("go.apps.dialogue.states", function() {
 
         $('[data-uuid="state3"] .titlebar')
           .simulate('mousedown')
-          .simulate('drag', {dx: -350});
+          .simulate('drag', {dx: -550});

justinvdm

diff --git a/go/apps/jsbox/contacts.py b/go/apps/jsbox/contacts.py
index f304334..810cd26 100644
--- a/go/apps/jsbox/contacts.py
+++ b/go/apps/jsbox/contacts.py
@@ -172,9 +172,9 @@ class ContactsResource(SandboxResource):
         Example:
         .. code-block:: javascript
             api.request(
-                'contacts.update',
-                {key: '123abc',

justinvdm

diff --git a/lib/state_machine.js b/lib/state_machine.js
index e360860..1d98f5a 100644
--- a/lib/state_machine.js
+++ b/lib/state_machine.js
@@ -323,16 +323,18 @@ function InteractionMachine(api, state_creator) {
             return self.switch_state(self.user.current_state);
         });
         p.add_callback(function () {
+            var ev_p;
+

justinvdm

diff --git a/lib/test_utils.js b/lib/test_utils.js
index 36399f6..8a3f57b 100644
--- a/lib/test_utils.js
+++ b/lib/test_utils.js
@@ -107,6 +107,7 @@ function ImTester(api, opts) {
         var session_event = opt_or_default(opts.session_event, "continue");
         var continue_session = opt_or_default(opts.continue_session, true);
         var from_addr = opt_or_default(opts.from_addr, "1234567");
+        var helper_metadata = opt_or_default(opts.helper_metadata, {});
         var message_id = opt_or_default(opts.message_id, "123");

justinvdm

diff --git a/go/contacts/tests.py b/go/contacts/tests.py
index 5175013..77bc145 100644
--- a/go/contacts/tests.py
+++ b/go/contacts/tests.py
@@ -31,22 +31,24 @@ def group_url(group_key):
     return reverse('contacts:group', kwargs={'group_key': group_key})
 
 
-def mkcontact(self, name=None, surname=None, msisdn=u'+1234567890', **kwargs):
-    return self.contact_store.new_contact(

justinvdm

diff --git a/go/base/static/templates/conversation/groups/row.jst b/go/base/static/templates/conversation/groups/row.jst
new file mode 100644
index 0000000..3487e9e
--- /dev/null
+++ b/go/base/static/templates/conversation/groups/row.jst
@@ -0,0 +1,12 @@
+<td>
+  <input
+   class="marker"

justinvdm

diff --git a/diamondash/public/css/dashboard.css b/diamondash/public/css/dashboard.css
index 76d1d4a..ce13d4e 100644
--- a/diamondash/public/css/dashboard.css
+++ b/diamondash/public/css/dashboard.css
@@ -5866,7 +5866,7 @@ a:hover {
 }
 
 .legend li {
-  width: 210px;
+  width: 230px;