From 4adc608f48f95fb323e319261b02eeac7c1fff54 Mon Sep 17 00:00:00 2001
From: Andy Armstrong <andya@edx.org>
Date: Tue, 13 May 2014 12:36:45 -0400
Subject: [PATCH 1/4] Specify that split_test_modules support children.

---
 common/lib/xmodule/xmodule/split_test_module.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/lib/xmodule/xmodule/split_test_module.py b/common/lib/xmodule/xmodule/split_test_module.py
index f80cd019b1..ddc8a0121a 100644
--- a/common/lib/xmodule/xmodule/split_test_module.py
+++ b/common/lib/xmodule/xmodule/split_test_module.py
@@ -21,6 +21,8 @@ log = logging.getLogger('edx.' + __name__)
 
 class SplitTestFields(object):
     """Fields needed for split test module"""
+    has_children = True
+
     user_partition_id = Integer(
         help="Which user partition is used for this test",
         scope=Scope.content

From cd1ec5fd58b8cd5cbda0d5d0dd0ee49103944fc6 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Tue, 13 May 2014 09:52:13 -0400
Subject: [PATCH 2/4] resolving display issue where older/smaller courses
 images wouldn't fill designated area on the student dashboard

---
 lms/static/sass/multicourse/_dashboard.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss
index 6991fba25b..6f975475ca 100644
--- a/lms/static/sass/multicourse/_dashboard.scss
+++ b/lms/static/sass/multicourse/_dashboard.scss
@@ -390,6 +390,7 @@
 
         img {
           width: 100%;
+          min-height: 100%;
         }
       }
 

From c6ea63d3fdfc8693bb49714572c8f08d5917e049 Mon Sep 17 00:00:00 2001
From: David Baumgold <david@davidbaumgold.com>
Date: Tue, 13 May 2014 17:14:07 -0400
Subject: [PATCH 3/4] Added @ksteph to AUTHORS file

See https://github.com/edx/edx-platform/pull/506
---
 AUTHORS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index aa74e4be65..8a215a3edc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -145,4 +145,4 @@ John Cox <johncox@google.com>
 Ben Weeks <benweeks@mit.edu>
 David Bodor <david.gabor.bodor@gmail.com>
 Sébastien Hinderer <Sebastien.Hinderer@inria.fr>
-
+Kristin Stephens <ksteph@cs.berkeley.edu>

From 2b8fafec560ea459b2053340463ca249d6a67b8c Mon Sep 17 00:00:00 2001
From: Waheed Ahmed <waheed.ahmed@arbisoft.com>
Date: Wed, 14 May 2014 15:36:15 +0500
Subject: [PATCH 4/4] Text changed in admin_dashboard for course enrollments.
 LMS-1596

---
 lms/djangoapps/dashboard/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/djangoapps/dashboard/views.py b/lms/djangoapps/dashboard/views.py
index cefa41252b..26e35f172c 100644
--- a/lms/djangoapps/dashboard/views.py
+++ b/lms/djangoapps/dashboard/views.py
@@ -56,7 +56,7 @@ def dashboard(request):
     # table queries need not take the form of raw SQL, but do in this case since
     # the MySQL backend for django isn't very friendly with group by or distinct
     table_queries = {}
-    table_queries["course enrollments"] = """
+    table_queries["course registrations (current enrollments)"] = """
         select
         course_id as Course,
         count(user_id) as Students