justinvdm

diff --git a/src/api/callNotes.js b/src/api/callNotes.js
index 100039a..88018d8 100644
--- a/src/api/callNotes.js
+++ b/src/api/callNotes.js
@@ -5,7 +5,7 @@ import { parseResults } from 'src/api/parse';
 
 
 export const listCallNotes = (auth, params = {}) => request({
-  url: '/call_note/',
+  url: '/v2/call_note/',

justinvdm

diff --git a/src/views/CallNoteDetail/CallNoteV1Detail/index.js b/src/views/CallNoteDetail/CallNoteV1Detail/index.js
index 29a2465..3811080 100644
--- a/src/views/CallNoteDetail/CallNoteV1Detail/index.js
+++ b/src/views/CallNoteDetail/CallNoteV1Detail/index.js
@@ -28,7 +28,7 @@ Title.propTypes = {
   children: PropTypes.any,
 };
 
-const CallNoteDetail = ({
+const CallNoteV1Detail = ({

justinvdm

[
  {
    "id": 10,
    "version": "2",
    "created_at": "2017-04-28T15:45:53.697771Z",
    "call": 12,
    "call_result": "COMPLETED",
    "activity_progress": "COMPLETED",
    "reflection": "dzdfdszf",
    "mood": "HAPPY",

justinvdm

diff --git a/src/app.js b/src/app.js
index c92a8d7..8f1cb5f 100644
--- a/src/app.js
+++ b/src/app.js
@@ -10,7 +10,7 @@ import configureStore from 'src/store/configureStore';
 import TopNavigationContainer from 'src/containers/TopNavigationContainer';
 
 
-const store = configureStore();
+export const store = configureStore();

justinvdm

diff --git a/mentorship/mentor/migrations/0048_auto_20170403_0950.py b/mentorship/mentor/migrations/0048_auto_20170403_0950.py
new file mode 100644
index 0000000..61fbf55
--- /dev/null
+++ b/mentorship/mentor/migrations/0048_auto_20170403_0950.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2017-04-03 09:50
+from __future__ import unicode_literals
+

justinvdm

diff --git a/mentorship/mentor/models.py b/mentorship/mentor/models.py
index d903e87..75ec7be 100644
--- a/mentorship/mentor/models.py
+++ b/mentorship/mentor/models.py
@@ -114,6 +114,7 @@ def create_notification_settings(sender, instance, created, **kwargs):
 
 class Call(models.Model):
     UPDATE_FIELDS = (
+        'status',
         'partner_id',

justinvdm

diff --git a/mentorship/mentor/migrations/0039_auto_20170227_1031.py b/mentorship/mentor/migrations/0039_auto_20170227_1031.py
new file mode 100644
index 0000000..9a6b2d4
--- /dev/null
+++ b/mentorship/mentor/migrations/0039_auto_20170227_1031.py
@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models

justinvdm

diff --git a/package.json b/package.json
index bb59456..b0bab18 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,8 @@
     "normalizr": "^2.2.1",
     "promise-each-concurrency": "^1.1.0",
     "raven-js": "^3.7.0",
-    "react": "^15.3.1",
+    "react": "~15.3.1",

justinvdm

diff --git a/mentorship/mentor/views.py b/mentorship/mentor/views.py
index 485fa3c..bda28ff 100644
--- a/mentorship/mentor/views.py
+++ b/mentorship/mentor/views.py
@@ -798,7 +798,7 @@ class MatchByQueryFilter(filters.FilterSet):
     mentor_email = django_filters.CharFilter(name="user__email")
     mentor_external_id = django_filters.CharFilter(name="external_id")
     mentee_email = django_filters.CharFilter(name="mentee__user__email")
-    mentor_external_id = django_filters.CharFilter(name="mentee__external_id")
+    mentee_external_id = django_filters.CharFilter(name="mentee__external_id")

justinvdm

diff --git a/src/containers/CallNoteListContainer.js b/src/containers/CallNoteListContainer.js
index c9a4dad..65759a4 100644
--- a/src/containers/CallNoteListContainer.js
+++ b/src/containers/CallNoteListContainer.js
@@ -7,7 +7,7 @@ import { chooseCallNote } from 'src/actions/callNotes';
 
 
 // TODO handle call notes without activities once we have designs for this
-export const mapStateToProps = (state, { activityId } = {}) => {
+export const mapStateToProps = (state, { activityId }) => {