From 630607d34554aef03f4e74adbdf26f0dd3b01496 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@mit.edu>
Date: Tue, 5 Feb 2013 00:21:04 +0000
Subject: [PATCH 01/19] fix forum management commands (assign_default_role
 moved); add reload_forum_users

---
 .../commands/assign_roles_for_course.py       |  3 +-
 .../commands/create_roles_for_existing.py     |  3 +-
 .../management/commands/reload_forum_users.py | 29 +++++++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 lms/djangoapps/django_comment_client/management/commands/reload_forum_users.py

diff --git a/lms/djangoapps/django_comment_client/management/commands/assign_roles_for_course.py b/lms/djangoapps/django_comment_client/management/commands/assign_roles_for_course.py
index 82f2290bc7..64378108b6 100644
--- a/lms/djangoapps/django_comment_client/management/commands/assign_roles_for_course.py
+++ b/lms/djangoapps/django_comment_client/management/commands/assign_roles_for_course.py
@@ -6,7 +6,8 @@ Enrollments.
 """
 from django.core.management.base import BaseCommand, CommandError
 
-from student.models import CourseEnrollment, assign_default_role
+from student.models import CourseEnrollment
+from django_comment_client.models import assign_default_role
 
 class Command(BaseCommand):
     args = 'course_id'
diff --git a/lms/djangoapps/django_comment_client/management/commands/create_roles_for_existing.py b/lms/djangoapps/django_comment_client/management/commands/create_roles_for_existing.py
index d1244a6690..3ec2d0646e 100644
--- a/lms/djangoapps/django_comment_client/management/commands/create_roles_for_existing.py
+++ b/lms/djangoapps/django_comment_client/management/commands/create_roles_for_existing.py
@@ -6,7 +6,8 @@ Enrollments.
 """
 from django.core.management.base import BaseCommand, CommandError
 
-from student.models import CourseEnrollment, assign_default_role
+from student.models import CourseEnrollment
+from django_comment_client.models import assign_default_role
 
 class Command(BaseCommand):
     args = 'course_id'
diff --git a/lms/djangoapps/django_comment_client/management/commands/reload_forum_users.py b/lms/djangoapps/django_comment_client/management/commands/reload_forum_users.py
new file mode 100644
index 0000000000..5e7e268270
--- /dev/null
+++ b/lms/djangoapps/django_comment_client/management/commands/reload_forum_users.py
@@ -0,0 +1,29 @@
+"""
+Reload forum (comment client) users from existing users.
+"""
+from django.core.management.base import BaseCommand, CommandError
+
+from django.contrib.auth.models import User
+import comment_client as cc
+
+class Command(BaseCommand):
+    help = 'Reload forum (comment client) users from existing users'
+
+    def adduser(self,user):
+        print user
+        try:
+            cc_user = cc.User.from_django_user(user)
+            cc_user.save()
+        except Exception as err:
+            print "update user info to discussion failed for user with id: %s" % user
+
+    def handle(self, *args, **options):
+        if len(args) != 0:
+            uset = [User.objects.get(username=x) for x in args]
+        else:
+            uset = User.objects.all()
+            
+        for user in uset:
+            self.adduser(user)
+        
+                
\ No newline at end of file

From 14899b90667902aca65732acd942b04f22764b04 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@mit.edu>
Date: Sat, 30 Mar 2013 03:40:40 +0000
Subject: [PATCH 02/19] fix lms migration to be compatible with xblock

---
 lms/djangoapps/lms_migration/migrate.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lms/djangoapps/lms_migration/migrate.py b/lms/djangoapps/lms_migration/migrate.py
index 569129f469..a677383035 100644
--- a/lms/djangoapps/lms_migration/migrate.py
+++ b/lms/djangoapps/lms_migration/migrate.py
@@ -39,12 +39,14 @@ def getip(request):
 
 
 def get_commit_id(course):
-    return course.metadata.get('GIT_COMMIT_ID', 'No commit id')
+    #return course.metadata.get('GIT_COMMIT_ID', 'No commit id')
+    return getattr(course, 'GIT_COMMIT_ID', 'No commit id')
     # getattr(def_ms.courses[reload_dir], 'GIT_COMMIT_ID','No commit id')
 
 
 def set_commit_id(course, commit_id):
-    course.metadata['GIT_COMMIT_ID'] = commit_id
+    #course.metadata['GIT_COMMIT_ID'] = commit_id
+    setattr(course, 'GIT_COMMIT_ID', commit_id)
     # setattr(def_ms.courses[reload_dir], 'GIT_COMMIT_ID', new_commit_id)
 
 
@@ -124,7 +126,8 @@ def manage_modulestores(request, reload_dir=None, commit_id=None):
 
     #----------------------------------------
 
-    dumpfields = ['definition', 'location', 'metadata']
+    #dumpfields = ['definition', 'location', 'metadata']
+    dumpfields = ['location', 'metadata']
 
     for cdir, course in def_ms.courses.items():
         html += '<hr width="100%"/>'
@@ -133,7 +136,7 @@ def manage_modulestores(request, reload_dir=None, commit_id=None):
         html += '<p>commit_id=%s</p>' % get_commit_id(course)
 
         for field in dumpfields:
-            data = getattr(course, field)
+            data = getattr(course, field, None)
             html += '<h3>%s</h3>' % field
             if type(data) == dict:
                 html += '<ul>'

From a0fab132a1e8f7dcf7803c0460eaa717761f5a35 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@mit.edu>
Date: Sun, 31 Mar 2013 15:50:00 +0000
Subject: [PATCH 03/19] sort course index in studio my courses page

---
 cms/templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cms/templates/index.html b/cms/templates/index.html
index 9482b9d9af..9ce764ed8d 100644
--- a/cms/templates/index.html
+++ b/cms/templates/index.html
@@ -67,7 +67,7 @@
       <article class="my-classes">
         % if user.is_active:
         <ul class="class-list">
-          %for course, url, lms_link in courses:
+          %for course, url, lms_link in sorted(courses, key=lambda s: s[0].lower()):
           <li>
             <a class="class-link" href="${url}" class="class-name">
               <span class="class-name">${course}</span>

From 1969a6633e4c7e9a28cb73a3a732ed33ada1d064 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@mit.edu>
Date: Sun, 31 Mar 2013 16:04:03 +0000
Subject: [PATCH 04/19] if user course creation is disabled & if staff email
 given, add link to request course creation by email

---
 cms/envs/common.py       | 1 +
 cms/templates/index.html | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/cms/envs/common.py b/cms/envs/common.py
index 12fa09947a..c348753632 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -34,6 +34,7 @@ MITX_FEATURES = {
     'ENABLE_DISCUSSION_SERVICE': False,
     'AUTH_USE_MIT_CERTIFICATES': False,
     'STUB_VIDEO_FOR_TESTING': False,   # do not display video when running automated acceptance tests
+    'STAFF_EMAIL': '',			# email address for staff (eg to request course creation)
 }
 ENABLE_JASMINE = False
 
diff --git a/cms/templates/index.html b/cms/templates/index.html
index 9482b9d9af..6a59ac8b86 100644
--- a/cms/templates/index.html
+++ b/cms/templates/index.html
@@ -46,6 +46,8 @@
           <li class="nav-item">
             % if not disable_course_creation:
               <a href="#" class="button new-button new-course-button"><i class="ss-icon ss-symbolicons-standard icon icon-create">&#x002B;</i> New Course</a>
+	    % elif settings.MITX_FEATURES.get('STAFF_EMAIL',''):
+	      <a href="mailto:${settings.MITX_FEATURES.get('STAFF_EMAIL','')}">Email staff to create course</a>
             % endif
           </li>
         </ul>

From 15d1bc372d44c5b907ac5675acea351569ad95de Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@mit.edu>
Date: Sun, 31 Mar 2013 19:28:09 +0000
Subject: [PATCH 05/19] clean up xqueue callback url generation; allow override
 from settings

---
 lms/djangoapps/courseware/module_render.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/lms/djangoapps/courseware/module_render.py b/lms/djangoapps/courseware/module_render.py
index 7a40d5c458..c7c749d2a0 100644
--- a/lms/djangoapps/courseware/module_render.py
+++ b/lms/djangoapps/courseware/module_render.py
@@ -177,18 +177,13 @@ def get_module_for_descriptor(user, request, descriptor, model_data_cache, cours
     # Intended use is as {ajax_url}/{dispatch_command}, so get rid of the trailing slash.
     ajax_url = ajax_url.rstrip('/')
 
-    # Fully qualified callback URL for external queueing system
-    xqueue_callback_url = '{proto}://{host}'.format(
-        host=request.get_host(),
-        proto=request.META.get('HTTP_X_FORWARDED_PROTO', 'https' if request.is_secure() else 'http')
-    )
-
     def make_xqueue_callback(dispatch='score_update'):
         # Fully qualified callback URL for external queueing system
         xqueue_callback_url = '{proto}://{host}'.format(
             host=request.get_host(),
             proto=request.META.get('HTTP_X_FORWARDED_PROTO', 'https' if request.is_secure() else 'http')
         )
+        xqueue_callback_url = settings.XQUEUE_INTERFACE.get('callback_url',xqueue_callback_url)	# allow override
 
         xqueue_callback_url += reverse('xqueue_callback',
                                       kwargs=dict(course_id=course_id,

From 025c5df16e5c9c210a9eb74331f69f9a34d5e433 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@mit.edu>
Date: Mon, 1 Apr 2013 21:49:11 +0000
Subject: [PATCH 06/19] fix IntegrityError duplicate entry issue with
 module_data Scope.student_state update

---
 lms/djangoapps/courseware/model_data.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lms/djangoapps/courseware/model_data.py b/lms/djangoapps/courseware/model_data.py
index b725f64308..e5c8eec216 100644
--- a/lms/djangoapps/courseware/model_data.py
+++ b/lms/djangoapps/courseware/model_data.py
@@ -241,9 +241,10 @@ class ModelDataCache(object):
             field_object, _ = StudentModule.objects.get_or_create(
                 course_id=self.course_id,
                 student=self.user,
-                module_type=key.block_scope_id.category,
                 module_state_key=key.block_scope_id.url(),
-                defaults={'state': json.dumps({})},
+                defaults={'state': json.dumps({}),
+                          'module_type': key.block_scope_id.category,
+                         },
             )
         elif key.scope == Scope.content:
             field_object, _ = XModuleContentField.objects.get_or_create(

From 9f9748b9fa72c77b66fc4a282e61049ace7342fd Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@edx.org>
Date: Wed, 3 Apr 2013 14:26:06 -0400
Subject: [PATCH 07/19] Stanford press release

---
 lms/templates/feed.rss                        | 11 ++-
 .../press_releases/stanford_announcement.html | 92 +++++++++++++++++++
 lms/urls.py                                   |  3 +
 3 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 lms/templates/static_templates/press_releases/stanford_announcement.html

diff --git a/lms/templates/feed.rss b/lms/templates/feed.rss
index a6fda0d20a..b68a9ceb27 100644
--- a/lms/templates/feed.rss
+++ b/lms/templates/feed.rss
@@ -6,7 +6,16 @@
   <link type="text/html" rel="alternate" href="http://blog.edx.org/"/>
   <link type="application/atom+xml" rel="self" href="https://github.com/blog.atom"/>
   <title>EdX Blog</title>
-  <updated>2013-03-15T14:00:12-07:00</updated>
+  <updated>2013-04-03T14:00:12-07:00</updated>
+  <entry>
+    <id>tag:www.edx.org,2012:Post/17</id>
+    <published>2012-12-19T14:00:00-07:00</published>
+    <updated>2012-12-19T14:00:00-07:00</updated>
+    <link type="text/html" rel="alternate" href="${reverse('press/stanford-to-work-with-edx')}"/>
+    <title>Stanford University to Collaborate with edX on Development of Non-Profit Open Source edX Platform</title>
+    <content type="html">&lt;img src=&quot;${static.url('images/press/releases/edx-logo_240x180.png')}&quot; /&gt;
+        &lt;p&gt;&lt;/p&gt;</content>
+  </entry>
   <entry>
     <id>tag:www.edx.org,2013:Post/16</id>
     <published>2013-03-15T10:00:00-07:00</published>
diff --git a/lms/templates/static_templates/press_releases/stanford_announcement.html b/lms/templates/static_templates/press_releases/stanford_announcement.html
new file mode 100644
index 0000000000..be788f319c
--- /dev/null
+++ b/lms/templates/static_templates/press_releases/stanford_announcement.html
@@ -0,0 +1,92 @@
+<%! from django.core.urlresolvers import reverse %>
+<%inherit file="../../main.html" />
+
+<%namespace name='static' file='../../static_content.html'/>
+
+<%block name="title"><title>Stanford University to Collaborate with edX on Development of Non-Profit Open Source edX Platform</title></%block>
+<div id="fb-root"></div>
+<script>(function(d, s, id) {
+  var js, fjs = d.getElementsByTagName(s)[0];
+  if (d.getElementById(id)) return;
+  js = d.createElement(s); js.id = id;
+  js.src = "//connect.facebook.net/en_US/all.js#xfbml=1";
+  fjs.parentNode.insertBefore(js, fjs);
+}(document, 'script', 'facebook-jssdk'));</script>
+
+<section class="pressrelease">
+  <section class="container">
+    <h1>Stanford University to Collaborate with edX on Development of Non-Profit Open Source edX Platform</h1>
+    <hr class="horizontal-divider">
+      <article>
+    <h2>edX Learning Platform to be open source and available on June 1</h2>
+
+        <p><strong>CAMBRIDGE, MA and STANFORD, CA &ndash; April 3, 2013 &ndash;</strong>
+
+Stanford University and <a href="https://www.edx.org">edX</a>, the not-for-profit online learning enterprise founded by Harvard University and the Massachusetts Institute of Technology (MIT), today announced their collaboration to advance the development of edX’s open source learning platform and provide free and open online learning tools for institutions around the world.</p>
+
+<p>As part of this announcement, edX will release the source code for its entire online learning platform on June 1, 2013. In support of that move, Stanford will integrate features of its existing Class2Go platform into the edX platform, use the integration as an internal platform for online coursework for on-campus and distance learners, and work collaboratively with edX and other institutions to further develop the edX platform.</p>
+
+<p>“This collaboration brings together two leaders in online education in a common effort to ensure that the world’s universities have the strongest possible not-for-profit, open source platform available to them,” said John Mitchell, vice provost for online learning at Stanford University. “A not-for-profit, open source platform will help universities experiment with different ways to produce and share content, fostering continued innovation through a vibrant community of contributors.”</p>
+
+<p>EdX and Stanford will collaborate along with others around the globe on the ongoing development and refinement of the edX online learning platform.  As of June 1, developers everywhere will be able to freely access the source code of the edX learning platform, including code for its Learning Management System (LMS); Studio, a course authoring tool; xBlock, an application programming interface (API) for integrating third-party learning objects; and machine grading API’s.  EdX will support and nurture the community of developers contributing to the enhancement of the edX platform by providing a rich environment for developer collaboration as well as technical and process guidelines to facilitate developer contributions.</p>
+
+<p>“It has been our vision to offer our platform as open source since edX’s founding by Harvard and MIT,” stated Anant Agarwal, president of edX.  “We are now realizing that vision, and I am pleased to welcome Stanford University, one of the world’s leading institutions of higher education, to further this global open source solution.  I want to acknowledge the key role played by our X Consortium member UC Berkeley, which was instrumental in fostering this collaboration. We believe the edX platform—the Linux of learning—will benefit from all the world’s institutions and communities.”</p>
+
+<p>EdX is pursuing an open source vision to enhance access to higher education for the entire world.  One of the chief benefits of massive open online courses (MOOCs) is that they bring together a tremendously diverse student body to learn with and from each other.  EdX has chosen to extend that perspective to its learning platform as well, knowing that drawing upon the global community of developers is an effective route to both transform and deliver the world’s best and most accessible online and blended learning experience.</p>
+
+<p>MOOCs and innovative online teaching approaches on college campuses, such as the “flipped classroom,” use web environments that support interactive video, online discussion, social/cohort interaction, assessment and other functions.  Open source online learning platforms will allow universities to develop their own delivery methods, partner with other universities and institutions as they choose, collect data, and control branding of their educational material. Further developing online opportunities through open source technology is a key objective of the partnership between edX and Stanford.</p>
+
+<p>Stanford will continue to provide a range of platforms for its instructors to choose from in hosting their online coursework, including continued partnerships with Coursera and other providers. The university will focus its ongoing platform development efforts on the new platform, combining key features from the Class2Go open source platform with the open source edX code base.</p>
+
+<p>The edX learning platform source code, as well as platform developments from Stanford, edX and other contributors, will be available on June 1, 2013 and can be accessed from the edX Platform Repository located at <a href="https://github.com/edX">https://github.com/edX</a>.</p>
+ 
+
+<h2>About edX</h2>
+
+<p><a href="https://www.edx.org/">EdX</a> is a not-for-profit enterprise of its founding partners <a href="http://www.harvard.edu">Harvard University</a> and the <a href="http://www.mit.edu">Massachusetts Institute of Technology</a> focused on transforming online and on-campus learning through groundbreaking methodologies, game-like experiences and cutting-edge research. EdX provides inspirational and transformative knowledge to students of all ages, social status, and income who form worldwide communities of learners. EdX uses its open source technology to transcend physical and social borders. We’re focused on people, not profit. EdX is based in Cambridge, Massachusetts in the USA.</p>
+
+<h2>About Stanford University</h2>
+
+<p>
+<a href="http://www.stanford.edu">Stanford University</a> is engaged in a variety of efforts to develop online learning – experimenting with coursework for both on-campus and off-campus students, researching key questions around what a digital environment means for teaching and learning, and pursuing platform development.  More information on Stanford’s online learning activities is available at <a href="http://online.stanford.edu">http://online.stanford.edu</a>
+
+
+      <section class="contact">
+        <p><strong>Media Contact:</strong></p>
+        <p>Dan O'Connell</p>
+        <p>oconnell@edx.org</p>
+        <p>(617) 480-6585</p>
+      </section>
+
+<section class="contact">
+<p>Brad Hayward</p>
+<p>bhayward@stanford.edu</p>
+<p>650-724-0199</p>
+</section>
+
+<section class="contact">
+<p>Lisa Lapin</p>
+<p>lapin@stanford.edu</p>
+<p>650-725-8396</p>
+</section>
+
+
+      <section class="footer">
+        <hr class="horizontal-divider">
+        <div class="logo"></div><h3 class="date">DATE: 01 - 29 - 2013</h3>
+        <div class="social-sharing">
+        <hr class="horizontal-divider">
+          <p>Share with friends and family:</p>
+          <a href="http://twitter.com/intent/tweet?text=:Stanford+to+work+with+edX+http://www.edx.org/press/stanford-to-work-with-edx" class="share">
+            <img src="${static.url('images/social/twitter-sharing.png')}">
+          </a>
+        </a>
+        <a href="mailto:?subject=Stanford%20to%20work%20with%20EdX…http://edx.org/press/stanford-to-work-with-edx" class="share">
+          <img src="${static.url('images/social/email-sharing.png')}">
+        </a>
+        <div class="fb-like" data-href="http://edx.org/press/stanford-to-work-with-edx" data-send="true" data-width="450" data-show-faces="true"></div>
+      </div>
+      </section>
+    </article>
+  </section>
+</section>
diff --git a/lms/urls.py b/lms/urls.py
index de5c8184fa..4a0608720a 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -153,6 +153,9 @@ urlpatterns = ('',
     url(r'^press/xblock_announcement$', 'static_template_view.views.render',
         {'template': 'press_releases/xblock_announcement.html'},
         name="press/xblock-announcement"),
+    url(r'^press/stanford-to-work-with-edx$', 'static_template_view.views.render',
+        {'template': 'press_releases/stanford_announcement.html'},
+        name="press/stanford-to-work-with-edx"),
 
     # Should this always update to point to the latest press release?
     (r'^pressrelease$', 'django.views.generic.simple.redirect_to',

From 7b226c34f8ba533cf745462dbe4f9c56e951a177 Mon Sep 17 00:00:00 2001
From: John Jarvis <jarv@edx.org>
Date: Wed, 3 Apr 2013 15:34:54 -0400
Subject: [PATCH 08/19] Adding new logo for stanford

---
 .../press/releases/stanford-logo_325x260.gif     | Bin 0 -> 5460 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 lms/static/images/press/releases/stanford-logo_325x260.gif

diff --git a/lms/static/images/press/releases/stanford-logo_325x260.gif b/lms/static/images/press/releases/stanford-logo_325x260.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d7532bd81def2dace3df8b8e5597d02acd685a41
GIT binary patch
literal 5460
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

literal 0
HcmV?d00001


From 0c81329fa515a64a12db9deea54fb56886937acb Mon Sep 17 00:00:00 2001
From: John Jarvis <jarv@edx.org>
Date: Wed, 3 Apr 2013 15:35:50 -0400
Subject: [PATCH 09/19] updating image link

---
 lms/templates/feed.rss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/templates/feed.rss b/lms/templates/feed.rss
index b68a9ceb27..8347155cc0 100644
--- a/lms/templates/feed.rss
+++ b/lms/templates/feed.rss
@@ -13,7 +13,7 @@
     <updated>2012-12-19T14:00:00-07:00</updated>
     <link type="text/html" rel="alternate" href="${reverse('press/stanford-to-work-with-edx')}"/>
     <title>Stanford University to Collaborate with edX on Development of Non-Profit Open Source edX Platform</title>
-    <content type="html">&lt;img src=&quot;${static.url('images/press/releases/edx-logo_240x180.png')}&quot; /&gt;
+    <content type="html">&lt;img src=&quot;${static.url('images/press/releases/stanford-university_240x135.png')}&quot; /&gt;
         &lt;p&gt;&lt;/p&gt;</content>
   </entry>
   <entry>

From 71cfc4441bfee3e395b73ae9547bc9cb2b0ef761 Mon Sep 17 00:00:00 2001
From: John Jarvis <jarv@edx.org>
Date: Wed, 3 Apr 2013 15:37:12 -0400
Subject: [PATCH 10/19] university->logo

---
 lms/templates/feed.rss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/templates/feed.rss b/lms/templates/feed.rss
index 8347155cc0..b329092f72 100644
--- a/lms/templates/feed.rss
+++ b/lms/templates/feed.rss
@@ -13,7 +13,7 @@
     <updated>2012-12-19T14:00:00-07:00</updated>
     <link type="text/html" rel="alternate" href="${reverse('press/stanford-to-work-with-edx')}"/>
     <title>Stanford University to Collaborate with edX on Development of Non-Profit Open Source edX Platform</title>
-    <content type="html">&lt;img src=&quot;${static.url('images/press/releases/stanford-university_240x135.png')}&quot; /&gt;
+    <content type="html">&lt;img src=&quot;${static.url('images/press/releases/stanford-logo_240x135.png')}&quot; /&gt;
         &lt;p&gt;&lt;/p&gt;</content>
   </entry>
   <entry>

From 1c581835f230a59411fe934e4dc4699adef20dbd Mon Sep 17 00:00:00 2001
From: John Jarvis <jarv@edx.org>
Date: Wed, 3 Apr 2013 15:39:11 -0400
Subject: [PATCH 11/19] changing stanford logo

---
 lms/templates/feed.rss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/templates/feed.rss b/lms/templates/feed.rss
index b329092f72..8347155cc0 100644
--- a/lms/templates/feed.rss
+++ b/lms/templates/feed.rss
@@ -13,7 +13,7 @@
     <updated>2012-12-19T14:00:00-07:00</updated>
     <link type="text/html" rel="alternate" href="${reverse('press/stanford-to-work-with-edx')}"/>
     <title>Stanford University to Collaborate with edX on Development of Non-Profit Open Source edX Platform</title>
-    <content type="html">&lt;img src=&quot;${static.url('images/press/releases/stanford-logo_240x135.png')}&quot; /&gt;
+    <content type="html">&lt;img src=&quot;${static.url('images/press/releases/stanford-university_240x135.png')}&quot; /&gt;
         &lt;p&gt;&lt;/p&gt;</content>
   </entry>
   <entry>

From 6d78425a829027711205d06d7039a2f6950a0a3a Mon Sep 17 00:00:00 2001
From: John Jarvis <jarv@edx.org>
Date: Wed, 3 Apr 2013 15:39:22 -0400
Subject: [PATCH 12/19] dding stanford-univ logo

---
 .../releases/stanford-university_240x135.png     | Bin 0 -> 8729 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 lms/static/images/press/releases/stanford-university_240x135.png

diff --git a/lms/static/images/press/releases/stanford-university_240x135.png b/lms/static/images/press/releases/stanford-university_240x135.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba9d2a6e9538304cb9fe47a34910a8bdf9288423
GIT binary patch
literal 8729
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
F`Ct3nxAg!3

literal 0
HcmV?d00001


From e8ee6616c44d4cf3e084cb339a10d46f6c415563 Mon Sep 17 00:00:00 2001
From: John Jarvis <jarv@edx.org>
Date: Wed, 3 Apr 2013 15:39:46 -0400
Subject: [PATCH 13/19] removing old logo

---
 .../press/releases/stanford-logo_325x260.gif     | Bin 5460 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 lms/static/images/press/releases/stanford-logo_325x260.gif

diff --git a/lms/static/images/press/releases/stanford-logo_325x260.gif b/lms/static/images/press/releases/stanford-logo_325x260.gif
deleted file mode 100644
index d7532bd81def2dace3df8b8e5597d02acd685a41..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5460
zcmWkvc_7pMAOC*8JHGqwu+Ky{<|;auJR+&BkWh^-IwvVz&$D`XD(B=5H9~H4<ff_I
zs!2(xMy{Njl%s2vgkryb?>}Duy#ITh+jm%-nz>lPc=#s-#XwNrvSlBoQqjD5(+Wk~
zjT;RYE<8SYvNI{^A&>X9uP<9uvpqJp(bKce&Fwk_4V09;ud6FuwQ9Jwwly-ca@Veh
zM~<XmSjEnr)qD0-@7=5D=}8A*Vrb~wz<}7?yx!ftzo4KeE30Pz{#-r1d_%(qPtT7p
zU$)1@H2L^6`}vJLdGg@Up|0fQC+E&}i$qOcUb1`l#2Yu>x3v{QP}b6=U%I=+rlut(
zCa+^+dT-ypZ)G+5^l65gS{0XDwtf4{kdVg9mlfUJeYv@>!ou#_*c7o?V~vfH<Hv`q
ztKU{vXD(crLZ!aAdNoH!N5bQEr>1tq$0w0UNqGE|GiRjX;V*)MS_Fcjii(z?phN`e
z&CM;hvupJ7Dq6Sh?v^b%%a&!%pI>Zje4EKkAQ19btjJrjB3oBCO+_V{MiVVsluRTh
z!f=VPamDW4Ia*p-OO~XmtKUM=cm%m)YC2R|+2ZeC>*VyMvvY2CHWq^7ASeNXroVi-
z1wru;^z*}q*_oN{^z`EO>qqMA=YIblZD?o{3YBwnpF27_6B0hPwav}VO^%ICefsq7
z(W4(DBfqDnCPznqe*F03{rjoUpQk>4{Pp9<ugS?o2>S5y<)_!LfB*dXxxM|vix+RJ
zs>Yj}i`K5Ka&#Pf_H3ZA@ZH0Qv%h|gH#N<C|NgnN^G#-ETXeL%tgPn1fe$S$UphKQ
z9zPxwi;Ikmeos!$eEarYF0VUza&mn9=lJ;7fq?`Vo_PEAwNN-aJzZ*HQNClx)R!;6
zCMJrFjAW&yor#GP!^1z`y=#k#`qI@k*3{JE=a;=?$(xLf$&rzJ9M0?L==YBwPk;UT
zdwMz^hRf{jC*HmLE|Y!j?~g-}_PDtEbLWy^I0-@GV7ThQ0kN4`$sg&>%u-PFCJrZ!
ziu%;vKKkrgXMFtgD_5TT`Ms^I?90o0Cz0ISx%2bu*Kg9(3k(d3O-yDcCNk93$6Hz+
zI6G%7UaXv*O+?Y|w6s(J(rL8mZ{L25jSZERDV0j?X*~4*TlIhVe<mQ35>jGIZN#Fw
zK+?Pwha1Hi^`Su5HpQki^J&Dw^=JATOS7KcU~ap%bjRK7=Qj=Z6dZnj_jdCwmTObW
zj(a&Tl1={|?|XhP_f<MOkgQ>QKd&{*=H`kcP51L(=W?@bQ*Fx%Itrcco#}5XE9|<%
ztG}jUS6=kyp8M;9BhBT-y%qeoO{sPjCH*y*zmNAfSKJwVB*0NL?JLFd`mlK`kG52n
zzI`UtwM(<Fy8Es<Vg1>Gma2OruSDA-G<R0tAA6m*r|{^D>aq`AV%O%hoi*j3dMp3^
zFz}+L;>(~UkfOD#w({%S#+xgTy{xVJJ|fMsOW*aN`p1XvduIn<KB)QmMOGi7)Y|>9
zcKZA1>%wEN9zOW>Q}MPrefOh3zM1;|Ver+XM@l6`yzHp4KpucvT?V7av^@Jb&jLOA
zTtcs69d!*Fo+t9;Axr;r*VdTl+}IGHuHUE~PF*+Z5@N9I#LzWXIf<e9pD8IL$Y}F~
zPNe6AOZ2r(ozc3x{u8_C1z9g1a}C~MGB$jZ+oK&FcFx9`p}|!-4dNV(g7jl~%TDWC
zdip#k#_VY0$hTRAjOm4FS5NC{{O3OHsC8^0Ku7afNtIg?AoiRPx$if0NIrEmHY3s2
zBvzzxvf%V`&N8Eo@{s@7E8a&QD{$r}p5Emp%?#X?V3_3*<^=*T#d?k92hJ$5J%tN2
z+Y5^DzNUJa%*E~73tjKN(JN7H^%{<$$=|qJUZzF}!|K*p>X#~+O~kS_CW}_5?<}~+
z%|=^I^D6Wm!dKl6S+-ZNw03jy8q0>xYYtkwCdawalh(tlw!U~@2r@G-hOge*GeiDt
z`AKKu!^5?$UfZ{-&NYWrpI+v1-g3go>vP;cn<uobs9F=eZLdvEe3B5=f1ipm(28X}
zT~$Bfc0YDkl6FhD&fZg&^T{cUEbGno7hkFdpW{YR|5`G!Eiz`Mu*q<_p@-$#w?3tI
z$$oqPvM!!;{n$R=<#cgvn`-etEejIIjBoMQ<2^a(o+G8VcK)5x)~9)X*0tDniE_+i
zs}p%luSsk7iHX?D=1<(4cb_`X?E_;PpL<tmq(u*_{a7VTG`3Tl+H&~li|j{qXBEcC
zrVVe(x5m=(RpRX%)xHdB{FQoX==APY;C=2fjg95O3!*097EG@88uK)7pV>08QPb?R
z{l@gR?#TMT%dKAQI=|`DjflBlqfGjZHBFtn)YiUjK6JL?x%5!q!yOIi3yYW8d+x8{
z<c0eF?mkHLFOROQ9^5(<EPkhv?YVg+@1t6m-mRcrez&~SM?5xw6&-gj`CaP@v-Y$Y
zUNq*IfH3=G)RtrOhtK<(I$K@7Wc)gDI6&+0;P?4X%)40j6`kRPq9H4^W}2>ZQFX9F
zX`cX={wL&}ZrU5w;KrCg-!fPQ-xK|Q16V%r;W9FvG<V{5k@5MDp_-fKWwZntEf2mC
zLcxxY42LuXv%l)Q+Nr7+T3Nm;tqY~K%L}-kYgj$&LJ3tJq$rODT}|$p#ckbIMNU==
za`b|^G1}V}I+rt#GXlxm_LWe_Oti__&IX54<k=$+>HE2!5k;=L?`-D%y@(%EuvDaf
zeqr>huZ6D2SJ!R!m!8j$F*<!+ud(-K*Au6?K!*+TjM>P1*46=|9WjT)R;L@59lmH3
zmDX~*pgY8L|L3+V*0pcRQQ=L=%sl~JOMAu@Kbu4BZzkEjc3TdcMf0s+yA8*tm33ZG
zJ~gqvk!CD!`)z=g9xX9S6|5g!R;IuE9CF{O?&H8VyXiGuR(nsC8g~-xjx$65R&ZM;
zI_}EM9$lJS?@qEBvOHyM5I=L%Gdpt7V%>~m;KDmzn&HCjx19Hc8hiZvDK=+ox@qp#
zq1c?9*dr!}JypJ$|7PJ^kJ}woe{p8>KL4|NB+eUW3))uooR!6H6-(VZSS78F%uiz+
z@6i|?x3Uulthi3--3Qpoj{U1O-W}Fzd%C{=Uc@nr6OQLMnwsR?Jg{CPJdEFA<!54<
zrJk{`xhY?_?AogA4L<q}I{G^#%O-<3wEn@9&+gpu-LJ>LeKvR3A>ovU=OvDY&9Tsf
z!eAxM#5r|q?y<j)_pX<d_p1An==x^mHEWD_p0yQPA6pXR=+@}e@UAORG$D$wy2#Zv
z@A3E$w<7r5t(pPH{k*c7BOlM;D^DRAIX=zzz9D4oqx}Zy*`v!$%Pu~+ovD+qmu;!P
zzsrF!{!i51UzQuOg^vA%rT)Lp>R$Y@@*;7wIMB3>X=v^4=eAKHSUXin*zHtJ*`FDO
zY|1c88@4K<(S%-lqWLvbPg&PXBTw18W)906OxNIbsg9(jBN>47^@8U7t0ZmZLI!!P
zG&=e)&>b{w+}yb?Hg(mBWm-W^TOQhItBEl9oQQEn{4FkuIvnV8oDj*w$NT=K!_*9A
z3*r(K^Y5yY0nFnscOSJ~=OiJ}`sA+`Cvb3NqsT>-@>j(P9QFU~g*H<HN@nG@m3jOd
zLA9CchZ`YL6_3JO8pPOVa5YD{2|06rNSzp7w^n6##Jn<q@YKLY&oUr@@jG#G;F?BV
z7Wb^<_oS}B6`Yl|(O2E|vZ3{1#-f#yvwGbejcp-ehBk7dYNQKhFAT<+2!#fEH66tg
zHe;iUa1)QMr7L9<J5%99c1isoc1aeUfJXd{dBm)_f6YC(fM+V8lxxC7p+xN<Nrzzf
zXWZRoc=aclOcN$bQJV|(uoS%v1_A1$Y+UfEGWtdv4&=_psU!&0qLrp3o$hD?W>7m!
zlLqvk34k074$B`k2I!I<Nyit;5aY{i#K{HFh4q9zTvK#0FL-5l9dfL@9;e5T2)aB3
zj#plRsL~+wAUW*FZ(wOYCgCEt&9CncT1jRRHcNE0mouNCn(PZ6CtODeE_jNjC>RpT
zzQCgakEdlnADPSP5TC<2o`I-JkI1c@0*bU+2`Zb|OAWbC_iPoRTSP7h_B?Pc#E%S~
z7+T=32%LY{VdU!J<Dgr%VcR(|{>k>AsJE=1uqhSHmkMO$(-1VNpt;h67}+*B6{r;0
zQ3Z4#?i02<9JpoFg?xx_GY^tc-cp``v%Ci7)@2SM7QZ=PNzudwCoV*>D+gy$))v))
zFLMV>0|@A8OM?kX=wD7a?Ik?=3`BNtA=RVwmRn%20&<do9T1c#LmjzfN;I;RkEh8=
zS`z=H3NR1yJ;?OKw5k8HJ;-0FUSiaPg%KSfQY8o$;QS=$6E0XIM!m#PtOS&?=nz1N
za@+w4I3_~9ggER1<sWGPp5gD$qY$GZ6#=l7z<vsJK97vLz!38)mqV&w00~6^RY030
zAX$Px$PcE-$m9zu7CaISCV5EwuS!4)m+1G0LLvApAS(D6C4-zOLOq0n*dd&G9tdEO
z)+-Hs@zEjvB7%+taAhdO4<X308xru47ZfT4aY9@~chLI{!2}qlhXR5Kt%e{14~Rr)
zvDC{R4)JD&oS1@wBp_c*RO9-2v509xV8DVdHUba#P#S{(DbQxgc{G{^L3pY*$%hvf
zW(rco@I5hznhGO0(DW6ku?V5MKnVs{=6wzK0@p|`5lUH5-W13a;|weD6KoJAhV&#?
z9Rnh&6M$QH1SOhu4kAYYwDS_N%^f^Th@_N8`tU=krSKVX=zcy(;s0I3k9u=COpS59
z^#F*G5ln4hYBb_a!l}uxD@cq914cdz@>if4N&y*hAnj%n(%I^WSqT1l1T{eTQ9<Xj
z2;MeG7auUpLOq?LX>}wUmX9hEBW6JMTskcvs>cb`O6W9BjL;P1GEr|n{7(hA)ri^)
zsh>#KRM*{9Emf%&Mj0}}G)twF6zgITOL7oeJtwA4(ciEFAua;#0K4-e9ZpA6Vb~Uf
z)SLj7op>ZMYLE@#88lUK6vl}sXp_T2;Q$HfViJ7BC{99601TGdty~+%D9`US3oa3%
z7*Cy36+z4gB<BRBi0a1=R_9`b)`WS}2`UWCT#R~)lks&JUw|9P1xF1j@1&$yDM=GT
zhD0~1N>0o)^AJrCxOW6Fp@8*`glvdWx`^Rn$hgl&_hUqT8C*Mk>!De~<7v8~81)mQ
zo4Nlq<pVV=ks6Kj7kMi;fcIjwRtCC9(FJ12Rgi&Qg7286U2jA)1&EmpaTEO^1)3QH
zc_Lcja};6`UIJK!k#1y`td@btu|$5N@O`bx+oqE-MhZR}T?7Sq^C*VP0h$D`8BivH
zePpPODOfC~hqE($6sW5NIeZ3QB*QOYhG~wY=U8-oHnOpRI<F3*h|v5B^q>%_lZ9V2
zOgFJ*9N?xr7N~DtoM3rH7~~8RWH?B88)fF$T?0F3z#66Ss<{M1N+~WfB3&M5q=>>@
zpy>%xT$@l!KBYsP=FftXS&St@<S#MGAVEv2fbk6YZpK&*ZU^#{ekDdkNz(;0>Bt3a
z3j}$0BevHfxz8i%7s&R)c+pS#GZEVHHcn>;Fc%i4t|(ISs3!%1TbOC88PH-@puZSj
zB`feenB~vCF)xF3|4iXNm{vc6HyqDpUjtjufSZCFek?*<BlKiEp<x`{XL&&aywxO5
zADmB|j>F683FPZq2jjPiL%diSY5}CjxfCy66!~j`3Zqapqr{I}cmO6(DNqYR00tv;
zalB+v-gE`D!H@t1&;_R=M<vF1#`@Er_&6DMk?R$=I7T!LG7UkS0Iu2qAzVhK0^Wf6
zV0EQ5c_{<Ft8-SpN(_0k2<!x)&L-N`{7F7-dpHQ<;x;_T9~M(p!$mC^qf9~cX3+|G
z&<wbPEh$D@DF?%V)k<K(BzR8|d=FV}6#%L@31ydjF-RUc!`R<kvX=uP5q_ux$(4=V
zP5=mtW-9_8B`{KrerJ(Q3Pmb%B!4;4jx7e9F!EUtC&uN1B>Ew+nkn*^-oi>Lfl@je
z0Ig}NA!(OUIc0!R<-~#C=Mt9-KnnzoN<oMM>P!OJBD!-AE~gp9GjYF_KM~chn2!)U
zboMI!0?B#`zI+Po<09X9HS3)M@fWa5JiiN)EYtymxdgNh@e&fHlFC9RgUQdGr(LVP
zvTCoKv?dodmp;TfkoT~W_G+-2jf+nPUm(a!@_?p|!9wq&HusHqzShhfdIn-FL+yAt
z)PcNIT!+dD>lYG;Fi8(erLYB90M4FUjw>ZuD4^Zke~5qd6a+r`0Mz+6M^`X*a#N0q
z)VsJu@&YKE3FQmPSyE^ZJCY(NB>~)DipWAH6d@23VLT*(`;&nNpZvH2HCDje1=Jn3
z8T|@$aW7~UlbmGudK9u2k<*2Zwn{dcBP^P+12H13kmn02hzv2Nu>!=LezrhCO@s1@
ztz^0wzfq9l3*cRB++y)FVk;G4;}b{_MM6$u<+>JOE$rtO02jeer3PRTTryu)=PxEF
z3E~cLu+cv~r+{WFh;%W;5m%Ac;VDeml#lZOWEem+Z$OmLRz(1s7|Ia6*dQhH6)=4q
zJQd>?D56!?!EOrpxZq_Vm#EK0+{Dlx7Qz0{>o6d&h#3mzAP?`tMh@5l5`d1fQC9^q
zFaFGC5rHlvWHKoSfyx_66OjYM3c?#7T#-3cRs%YHq#k^njCa0y9Hep)RVASJ)V^?)
zKG|1F31T9aTmqE^e`^6Z#iSS>Cg5Q)QtWII$PrQ>o&#k<l7QPGkdeZLBqlAeRFOt!
zG{&;9{T7`!dDP2NELA|oV9YwI{ic+3nF%Fs0vb~4bsjZY^q9~}K>)H}guD?WDFq-_
zidC{Y$ue?z5wP-Y-}i}BCBhtvfuxpVliD65CJCHfQ~KYe&At(7^kiD}WFP6t@$Jb=
z?J0QBQ`Fy6GTS58=)G&vd;dspxo>Y}YH#&}-rD}&hqJvBjlRbgeNT?`HTd>5ruH>G
z=xgckdpX-D)#z`t=x;yL-|5@mo!Z~?puexbe_-8gzf5Cb$YNml$iREwfzi}~@dpDR
i`v*SH4k$DRzgY}U92uPS9h^!XoOv+#+XBEaWd1)EMU6oK


From b2e8780f9b58d3e14a724f09a9d299227ae4af22 Mon Sep 17 00:00:00 2001
From: John Jarvis <jarv@edx.org>
Date: Wed, 3 Apr 2013 16:01:15 -0400
Subject: [PATCH 14/19] adding a smaller stanford image

---
 .../releases/stanford-university_102_57.png      | Bin 0 -> 2982 bytes
 lms/templates/feed.rss                           |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 lms/static/images/press/releases/stanford-university_102_57.png

diff --git a/lms/static/images/press/releases/stanford-university_102_57.png b/lms/static/images/press/releases/stanford-university_102_57.png
new file mode 100644
index 0000000000000000000000000000000000000000..67910ff5d8da357887b2d60c3935c2ad32d25238
GIT binary patch
literal 2982
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
I)4@di0|{WYp#T5?

literal 0
HcmV?d00001

diff --git a/lms/templates/feed.rss b/lms/templates/feed.rss
index 8347155cc0..1ac88ffe34 100644
--- a/lms/templates/feed.rss
+++ b/lms/templates/feed.rss
@@ -13,7 +13,7 @@
     <updated>2012-12-19T14:00:00-07:00</updated>
     <link type="text/html" rel="alternate" href="${reverse('press/stanford-to-work-with-edx')}"/>
     <title>Stanford University to Collaborate with edX on Development of Non-Profit Open Source edX Platform</title>
-    <content type="html">&lt;img src=&quot;${static.url('images/press/releases/stanford-university_240x135.png')}&quot; /&gt;
+    <content type="html">&lt;img src=&quot;${static.url('images/press/releases/stanford-university_102x57.png')}&quot; /&gt;
         &lt;p&gt;&lt;/p&gt;</content>
   </entry>
   <entry>

From d2313d851a98bbbb474a05c701f7ddb9309f31a7 Mon Sep 17 00:00:00 2001
From: John Jarvis <jarv@edx.org>
Date: Wed, 3 Apr 2013 16:02:41 -0400
Subject: [PATCH 15/19] renaming image

---
 ...ty_102_57.png => stanford-university_102x57.png} | Bin
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename lms/static/images/press/releases/{stanford-university_102_57.png => stanford-university_102x57.png} (100%)

diff --git a/lms/static/images/press/releases/stanford-university_102_57.png b/lms/static/images/press/releases/stanford-university_102x57.png
similarity index 100%
rename from lms/static/images/press/releases/stanford-university_102_57.png
rename to lms/static/images/press/releases/stanford-university_102x57.png

From 039ccb83ccbb55a15d252fb59f1c97bb46e7a529 Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Tue, 2 Apr 2013 16:23:32 -0400
Subject: [PATCH 16/19] Migrate to the open source XBlock repo

---
 common/lib/xmodule/xmodule/abtest_module.py   |  2 +-
 common/lib/xmodule/xmodule/capa_module.py     | 12 ++---
 .../xmodule/combined_open_ended_module.py     | 10 ++--
 .../xmodule/xmodule/peer_grading_module.py    |  2 +-
 common/lib/xmodule/xmodule/poll_module.py     |  4 +-
 .../lib/xmodule/xmodule/randomize_module.py   |  2 +-
 common/lib/xmodule/xmodule/seq_module.py      |  2 +-
 .../lib/xmodule/xmodule/timelimit_module.py   |  6 +--
 common/lib/xmodule/xmodule/video_module.py    |  2 +-
 .../lib/xmodule/xmodule/videoalpha_module.py  |  2 +-
 lms/djangoapps/courseware/grades.py           |  4 +-
 lms/djangoapps/courseware/model_data.py       | 46 ++++++++--------
 lms/djangoapps/courseware/models.py           |  4 +-
 .../courseware/tests/test_model_data.py       | 54 +++++++++----------
 local-requirements.txt                        |  2 +-
 15 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/common/lib/xmodule/xmodule/abtest_module.py b/common/lib/xmodule/xmodule/abtest_module.py
index 0e1c66df8e..e84de270b2 100644
--- a/common/lib/xmodule/xmodule/abtest_module.py
+++ b/common/lib/xmodule/xmodule/abtest_module.py
@@ -33,7 +33,7 @@ def group_from_value(groups, v):
 
 class ABTestFields(object):
     group_portions = Object(help="What proportions of students should go in each group", default={DEFAULT: 1}, scope=Scope.content)
-    group_assignments = Object(help="What group this user belongs to", scope=Scope.student_preferences, default={})
+    group_assignments = Object(help="What group this user belongs to", scope=Scope.preferences, default={})
     group_content = Object(help="What content to display to each group", scope=Scope.content, default={DEFAULT: []})
     experiment = String(help="Experiment that this A/B test belongs to", scope=Scope.content)
     has_children = True
diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py
index 2097e4d4ee..025d156e03 100644
--- a/common/lib/xmodule/xmodule/capa_module.py
+++ b/common/lib/xmodule/xmodule/capa_module.py
@@ -83,7 +83,7 @@ class ComplexEncoder(json.JSONEncoder):
 
 
 class CapaFields(object):
-    attempts = StringyInteger(help="Number of attempts taken by the student on this problem", default=0, scope=Scope.student_state)
+    attempts = StringyInteger(help="Number of attempts taken by the student on this problem", default=0, scope=Scope.user_state)
     max_attempts = StringyInteger(help="Maximum number of attempts that a student is allowed", scope=Scope.settings)
     due = Date(help="Date that this problem is due by", scope=Scope.settings)
     graceperiod = Timedelta(help="Amount of time after the due date that submissions will be accepted", scope=Scope.settings)
@@ -91,12 +91,12 @@ class CapaFields(object):
     force_save_button = Boolean(help="Whether to force the save button to appear on the page", scope=Scope.settings, default=False)
     rerandomize = Randomization(help="When to rerandomize the problem", default="always", scope=Scope.settings)
     data = String(help="XML data for the problem", scope=Scope.content)
-    correct_map = Object(help="Dictionary with the correctness of current student answers", scope=Scope.student_state, default={})
-    input_state = Object(help="Dictionary for maintaining the state of inputtypes", scope=Scope.student_state)
-    student_answers = Object(help="Dictionary with the current student responses", scope=Scope.student_state)
-    done = Boolean(help="Whether the student has answered the problem", scope=Scope.student_state)
+    correct_map = Object(help="Dictionary with the correctness of current student answers", scope=Scope.user_state, default={})
+    input_state = Object(help="Dictionary for maintaining the state of inputtypes", scope=Scope.user_state)
+    student_answers = Object(help="Dictionary with the current student responses", scope=Scope.user_state)
+    done = Boolean(help="Whether the student has answered the problem", scope=Scope.user_state)
     display_name = String(help="Display name for this module", scope=Scope.settings)
-    seed = StringyInteger(help="Random seed for this student", scope=Scope.student_state)
+    seed = StringyInteger(help="Random seed for this student", scope=Scope.user_state)
     weight = StringyFloat(help="How much to weight this problem by", scope=Scope.settings)
     markdown = String(help="Markdown source of this module", scope=Scope.settings)
 
diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index f70cf62d29..71b641fbd2 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -50,14 +50,14 @@ class VersionInteger(Integer):
 
 class CombinedOpenEndedFields(object):
     display_name = String(help="Display name for this module", default="Open Ended Grading", scope=Scope.settings)
-    current_task_number = Integer(help="Current task that the student is on.", default=0, scope=Scope.student_state)
-    task_states = List(help="List of state dictionaries of each task within this module.", scope=Scope.student_state)
+    current_task_number = Integer(help="Current task that the student is on.", default=0, scope=Scope.user_state)
+    task_states = List(help="List of state dictionaries of each task within this module.", scope=Scope.user_state)
     state = String(help="Which step within the current task that the student is on.", default="initial",
-                   scope=Scope.student_state)
+                   scope=Scope.user_state)
     student_attempts = Integer(help="Number of attempts taken by the student on this problem", default=0,
-                               scope=Scope.student_state)
+                               scope=Scope.user_state)
     ready_to_reset = Boolean(help="If the problem is ready to be reset or not.", default=False,
-                             scope=Scope.student_state)
+                             scope=Scope.user_state)
     attempts = Integer(help="Maximum number of attempts that a student is allowed.", default=1, scope=Scope.settings)
     is_graded = Boolean(help="Whether or not the problem is graded.", default=False, scope=Scope.settings)
     accept_file_upload = Boolean(help="Whether or not the problem accepts file uploads.", default=False,
diff --git a/common/lib/xmodule/xmodule/peer_grading_module.py b/common/lib/xmodule/xmodule/peer_grading_module.py
index 5d064378bf..2226b8f7dd 100644
--- a/common/lib/xmodule/xmodule/peer_grading_module.py
+++ b/common/lib/xmodule/xmodule/peer_grading_module.py
@@ -38,7 +38,7 @@ class PeerGradingFields(object):
     max_grade = Integer(help="The maximum grade that a student can receieve for this problem.", default=MAX_SCORE,
                         scope=Scope.settings)
     student_data_for_location = Object(help="Student data for a given peer grading problem.", default=json.dumps({}),
-                                       scope=Scope.student_state)
+                                       scope=Scope.user_state)
     weight = StringyFloat(help="How much to weight this problem by", scope=Scope.settings)
 
 
diff --git a/common/lib/xmodule/xmodule/poll_module.py b/common/lib/xmodule/xmodule/poll_module.py
index 0fb3bfb496..c8ad44a918 100644
--- a/common/lib/xmodule/xmodule/poll_module.py
+++ b/common/lib/xmodule/xmodule/poll_module.py
@@ -30,8 +30,8 @@ class PollFields(object):
     # Name of poll to use in links to this poll
     display_name = String(help="Display name for this module", scope=Scope.settings)
 
-    voted = Boolean(help="Whether this student has voted on the poll", scope=Scope.student_state, default=False)
-    poll_answer = String(help="Student answer", scope=Scope.student_state, default='')
+    voted = Boolean(help="Whether this student has voted on the poll", scope=Scope.user_state, default=False)
+    poll_answer = String(help="Student answer", scope=Scope.user_state, default='')
     poll_answers = Object(help="All possible answers for the poll fro other students", scope=Scope.content)
 
     answers = List(help="Poll answers from xml", scope=Scope.content, default=[])
diff --git a/common/lib/xmodule/xmodule/randomize_module.py b/common/lib/xmodule/xmodule/randomize_module.py
index 6620ab3cf7..240f33e33e 100644
--- a/common/lib/xmodule/xmodule/randomize_module.py
+++ b/common/lib/xmodule/xmodule/randomize_module.py
@@ -10,7 +10,7 @@ log = logging.getLogger('mitx.' + __name__)
 
 
 class RandomizeFields(object):
-    choice = Integer(help="Which random child was chosen", scope=Scope.student_state)
+    choice = Integer(help="Which random child was chosen", scope=Scope.user_state)
 
 
 class RandomizeModule(RandomizeFields, XModule):
diff --git a/common/lib/xmodule/xmodule/seq_module.py b/common/lib/xmodule/xmodule/seq_module.py
index f8e982f1a0..f6c3133ede 100644
--- a/common/lib/xmodule/xmodule/seq_module.py
+++ b/common/lib/xmodule/xmodule/seq_module.py
@@ -23,7 +23,7 @@ class SequenceFields(object):
 
     # NOTE: Position is 1-indexed.  This is silly, but there are now student
     # positions saved on prod, so it's not easy to fix.
-    position = Integer(help="Last tab viewed in this sequence", scope=Scope.student_state)
+    position = Integer(help="Last tab viewed in this sequence", scope=Scope.user_state)
 
 
 class SequenceModule(SequenceFields, XModule):
diff --git a/common/lib/xmodule/xmodule/timelimit_module.py b/common/lib/xmodule/xmodule/timelimit_module.py
index efa47a5dca..732aa25e2e 100644
--- a/common/lib/xmodule/xmodule/timelimit_module.py
+++ b/common/lib/xmodule/xmodule/timelimit_module.py
@@ -16,9 +16,9 @@ log = logging.getLogger(__name__)
 
 
 class TimeLimitFields(object):
-    beginning_at = Float(help="The time this timer was started", scope=Scope.student_state)
-    ending_at = Float(help="The time this timer will end", scope=Scope.student_state)
-    accomodation_code = String(help="A code indicating accommodations to be given the student", scope=Scope.student_state)
+    beginning_at = Float(help="The time this timer was started", scope=Scope.user_state)
+    ending_at = Float(help="The time this timer will end", scope=Scope.user_state)
+    accomodation_code = String(help="A code indicating accommodations to be given the student", scope=Scope.user_state)
     time_expired_redirect_url = String(help="Url to redirect users to after the timelimit has expired", scope=Scope.settings)
     duration = Float(help="The length of this timer", scope=Scope.settings)
     suppress_toplevel_navigation = Boolean(help="Whether the toplevel navigation should be suppressed when viewing this module", scope=Scope.settings)
diff --git a/common/lib/xmodule/xmodule/video_module.py b/common/lib/xmodule/xmodule/video_module.py
index 0203299b40..2343d24a57 100644
--- a/common/lib/xmodule/xmodule/video_module.py
+++ b/common/lib/xmodule/xmodule/video_module.py
@@ -19,7 +19,7 @@ log = logging.getLogger(__name__)
 
 class VideoFields(object):
     data = String(help="XML data for the problem", scope=Scope.content)
-    position = Integer(help="Current position in the video", scope=Scope.student_state, default=0)
+    position = Integer(help="Current position in the video", scope=Scope.user_state, default=0)
     display_name = String(help="Display name for this module", scope=Scope.settings)
 
 
diff --git a/common/lib/xmodule/xmodule/videoalpha_module.py b/common/lib/xmodule/xmodule/videoalpha_module.py
index a88c906b9c..6754f8f664 100644
--- a/common/lib/xmodule/xmodule/videoalpha_module.py
+++ b/common/lib/xmodule/xmodule/videoalpha_module.py
@@ -21,7 +21,7 @@ log = logging.getLogger(__name__)
 
 class VideoAlphaFields(object):
     data = String(help="XML data for the problem", scope=Scope.content)
-    position = Integer(help="Current position in the video", scope=Scope.student_state, default=0)
+    position = Integer(help="Current position in the video", scope=Scope.user_state, default=0)
     display_name = String(help="Display name for this module", scope=Scope.settings)
 
 
diff --git a/lms/djangoapps/courseware/grades.py b/lms/djangoapps/courseware/grades.py
index 51c0b21799..ae386f1528 100644
--- a/lms/djangoapps/courseware/grades.py
+++ b/lms/djangoapps/courseware/grades.py
@@ -165,7 +165,7 @@ def grade(student, request, course, model_data_cache=None, keep_raw_scores=False
                 # Create a fake key to pull out a StudentModule object from the ModelDataCache
 
                 key = LmsKeyValueStore.Key(
-                    Scope.student_state,
+                    Scope.user_state,
                     student.id,
                     moduledescriptor.location,
                     None
@@ -370,7 +370,7 @@ def get_score(course_id, user, problem_descriptor, module_creator, model_data_ca
 
     # Create a fake KeyValueStore key to pull out the StudentModule
     key = LmsKeyValueStore.Key(
-        Scope.student_state,
+        Scope.user_state,
         user.id,
         problem_descriptor.location,
         None
diff --git a/lms/djangoapps/courseware/model_data.py b/lms/djangoapps/courseware/model_data.py
index b725f64308..826e766e5d 100644
--- a/lms/djangoapps/courseware/model_data.py
+++ b/lms/djangoapps/courseware/model_data.py
@@ -134,7 +134,7 @@ class ModelDataCache(object):
         """
         if scope in (Scope.children, Scope.parent):
             return []
-        elif scope == Scope.student_state:
+        elif scope == Scope.user_state:
             return self._chunked_query(
                 StudentModule,
                 'module_state_key__in',
@@ -159,7 +159,7 @@ class ModelDataCache(object):
                 ),
                 field_name__in=set(field.name for field in fields),
             )
-        elif scope == Scope.student_preferences:
+        elif scope == Scope.preferences:
             return self._chunked_query(
                 XModuleStudentPrefsField,
                 'module_type__in',
@@ -167,7 +167,7 @@ class ModelDataCache(object):
                 student=self.user.pk,
                 field_name__in=set(field.name for field in fields),
             )
-        elif scope == Scope.student_info:
+        elif scope == Scope.user_info:
             return self._query(
                 XModuleStudentInfoField,
                 student=self.user.pk,
@@ -190,15 +190,15 @@ class ModelDataCache(object):
         """
         Return the key used in the ModelDataCache for the specified KeyValueStore key
         """
-        if key.scope == Scope.student_state:
+        if key.scope == Scope.user_state:
             return (key.scope, key.block_scope_id.url())
         elif key.scope == Scope.content:
             return (key.scope, key.block_scope_id.url(), key.field_name)
         elif key.scope == Scope.settings:
             return (key.scope, '%s-%s' % (self.course_id, key.block_scope_id.url()), key.field_name)
-        elif key.scope == Scope.student_preferences:
+        elif key.scope == Scope.preferences:
             return (key.scope, key.block_scope_id, key.field_name)
-        elif key.scope == Scope.student_info:
+        elif key.scope == Scope.user_info:
             return (key.scope, key.field_name)
 
     def _cache_key_from_field_object(self, scope, field_object):
@@ -206,15 +206,15 @@ class ModelDataCache(object):
         Return the key used in the ModelDataCache for the specified scope and
         field
         """
-        if scope == Scope.student_state:
+        if scope == Scope.user_state:
             return (scope, field_object.module_state_key)
         elif scope == Scope.content:
             return (scope, field_object.definition_id, field_object.field_name)
         elif scope == Scope.settings:
             return (scope, field_object.usage_id, field_object.field_name)
-        elif scope == Scope.student_preferences:
+        elif scope == Scope.preferences:
             return (scope, field_object.module_type, field_object.field_name)
-        elif scope == Scope.student_info:
+        elif scope == Scope.user_info:
             return (scope, field_object.field_name)
 
     def find(self, key):
@@ -237,7 +237,7 @@ class ModelDataCache(object):
         if field_object is not None:
             return field_object
 
-        if key.scope == Scope.student_state:
+        if key.scope == Scope.user_state:
             field_object, _ = StudentModule.objects.get_or_create(
                 course_id=self.course_id,
                 student=self.user,
@@ -255,13 +255,13 @@ class ModelDataCache(object):
                 field_name=key.field_name,
                 usage_id='%s-%s' % (self.course_id, key.block_scope_id.url()),
             )
-        elif key.scope == Scope.student_preferences:
+        elif key.scope == Scope.preferences:
             field_object, _ = XModuleStudentPrefsField.objects.get_or_create(
                 field_name=key.field_name,
                 module_type=key.block_scope_id,
                 student=self.user,
             )
-        elif key.scope == Scope.student_info:
+        elif key.scope == Scope.user_info:
             field_object, _ = XModuleStudentInfoField.objects.get_or_create(
                 field_name=key.field_name,
                 student=self.user,
@@ -281,12 +281,12 @@ class LmsKeyValueStore(KeyValueStore):
     If the scope to write to is not one of the 5 named scopes:
         Scope.content
         Scope.settings
-        Scope.student_state
-        Scope.student_preferences
-        Scope.student_info
+        Scope.user_state
+        Scope.preferences
+        Scope.user_info
     then an InvalidScopeError will be raised.
 
-    Data for Scope.student_state is stored as StudentModule objects via the django orm.
+    Data for Scope.user_state is stored as StudentModule objects via the django orm.
 
     Data for the other scopes is stored in individual objects that are named for the
     scope involved and have the field name as a key
@@ -297,9 +297,9 @@ class LmsKeyValueStore(KeyValueStore):
     _allowed_scopes = (
         Scope.content,
         Scope.settings,
-        Scope.student_state,
-        Scope.student_preferences,
-        Scope.student_info,
+        Scope.user_state,
+        Scope.preferences,
+        Scope.user_info,
         Scope.children,
     )
 
@@ -321,7 +321,7 @@ class LmsKeyValueStore(KeyValueStore):
         if field_object is None:
             raise KeyError(key.field_name)
 
-        if key.scope == Scope.student_state:
+        if key.scope == Scope.user_state:
             return json.loads(field_object.state)[key.field_name]
         else:
             return json.loads(field_object.value)
@@ -335,7 +335,7 @@ class LmsKeyValueStore(KeyValueStore):
         if key.scope not in self._allowed_scopes:
             raise InvalidScopeError(key.scope)
 
-        if key.scope == Scope.student_state:
+        if key.scope == Scope.user_state:
             state = json.loads(field_object.state)
             state[key.field_name] = value
             field_object.state = json.dumps(state)
@@ -355,7 +355,7 @@ class LmsKeyValueStore(KeyValueStore):
         if field_object is None:
             raise KeyError(key.field_name)
 
-        if key.scope == Scope.student_state:
+        if key.scope == Scope.user_state:
             state = json.loads(field_object.state)
             del state[key.field_name]
             field_object.state = json.dumps(state)
@@ -377,7 +377,7 @@ class LmsKeyValueStore(KeyValueStore):
         if field_object is None:
             return False
 
-        if key.scope == Scope.student_state:
+        if key.scope == Scope.user_state:
             return key.field_name in json.loads(field_object.state)
         else:
             return True
diff --git a/lms/djangoapps/courseware/models.py b/lms/djangoapps/courseware/models.py
index 448757a2f8..53493b8e45 100644
--- a/lms/djangoapps/courseware/models.py
+++ b/lms/djangoapps/courseware/models.py
@@ -165,7 +165,7 @@ class XModuleSettingsField(models.Model):
 
 class XModuleStudentPrefsField(models.Model):
     """
-    Stores data set in the Scope.student_preferences scope by an xmodule field
+    Stores data set in the Scope.preferences scope by an xmodule field
     """
 
     class Meta:
@@ -199,7 +199,7 @@ class XModuleStudentPrefsField(models.Model):
 
 class XModuleStudentInfoField(models.Model):
     """
-    Stores data set in the Scope.student_preferences scope by an xmodule field
+    Stores data set in the Scope.preferences scope by an xmodule field
     """
 
     class Meta:
diff --git a/lms/djangoapps/courseware/tests/test_model_data.py b/lms/djangoapps/courseware/tests/test_model_data.py
index 7f4727cf15..65eaa5a4bd 100644
--- a/lms/djangoapps/courseware/tests/test_model_data.py
+++ b/lms/djangoapps/courseware/tests/test_model_data.py
@@ -32,9 +32,9 @@ course_id = 'edX/test_course/test'
 
 content_key = partial(LmsKeyValueStore.Key, Scope.content, None, location('def_id'))
 settings_key = partial(LmsKeyValueStore.Key, Scope.settings, None, location('def_id'))
-student_state_key = partial(LmsKeyValueStore.Key, Scope.student_state, 'user', location('def_id'))
-student_prefs_key = partial(LmsKeyValueStore.Key, Scope.student_preferences, 'user', 'problem')
-student_info_key = partial(LmsKeyValueStore.Key, Scope.student_info, 'user', None)
+user_state_key = partial(LmsKeyValueStore.Key, Scope.user_state, 'user', location('def_id'))
+prefs_key = partial(LmsKeyValueStore.Key, Scope.preferences, 'user', 'problem')
+user_info_key = partial(LmsKeyValueStore.Key, Scope.user_info, 'user', None)
 
 
 class UserFactory(factory.Factory):
@@ -115,13 +115,13 @@ class TestInvalidScopes(TestCase):
     def setUp(self):
         self.desc_md = {}
         self.user = UserFactory.create()
-        self.mdc = ModelDataCache([mock_descriptor([mock_field(Scope.student_state, 'a_field')])], course_id, self.user)
+        self.mdc = ModelDataCache([mock_descriptor([mock_field(Scope.user_state, 'a_field')])], course_id, self.user)
         self.kvs = LmsKeyValueStore(self.desc_md, self.mdc)
 
     def test_invalid_scopes(self):
-        for scope in (Scope(student=True, block=BlockScope.DEFINITION),
-                      Scope(student=False, block=BlockScope.TYPE),
-                      Scope(student=False, block=BlockScope.ALL)):
+        for scope in (Scope(user=True, block=BlockScope.DEFINITION),
+                      Scope(user=False, block=BlockScope.TYPE),
+                      Scope(user=False, block=BlockScope.ALL)):
             self.assertRaises(InvalidScopeError, self.kvs.get, LmsKeyValueStore.Key(scope, None, None, 'field'))
             self.assertRaises(InvalidScopeError, self.kvs.set, LmsKeyValueStore.Key(scope, None, None, 'field'), 'value')
             self.assertRaises(InvalidScopeError, self.kvs.delete, LmsKeyValueStore.Key(scope, None, None, 'field'))
@@ -134,48 +134,48 @@ class TestStudentModuleStorage(TestCase):
         self.desc_md = {}
         student_module = StudentModuleFactory(state=json.dumps({'a_field': 'a_value'}))
         self.user = student_module.student
-        self.mdc = ModelDataCache([mock_descriptor([mock_field(Scope.student_state, 'a_field')])], course_id, self.user)
+        self.mdc = ModelDataCache([mock_descriptor([mock_field(Scope.user_state, 'a_field')])], course_id, self.user)
         self.kvs = LmsKeyValueStore(self.desc_md, self.mdc)
 
     def test_get_existing_field(self):
         "Test that getting an existing field in an existing StudentModule works"
-        self.assertEquals('a_value', self.kvs.get(student_state_key('a_field')))
+        self.assertEquals('a_value', self.kvs.get(user_state_key('a_field')))
 
     def test_get_missing_field(self):
         "Test that getting a missing field from an existing StudentModule raises a KeyError"
-        self.assertRaises(KeyError, self.kvs.get, student_state_key('not_a_field'))
+        self.assertRaises(KeyError, self.kvs.get, user_state_key('not_a_field'))
 
     def test_set_existing_field(self):
-        "Test that setting an existing student_state field changes the value"
-        self.kvs.set(student_state_key('a_field'), 'new_value')
+        "Test that setting an existing user_state field changes the value"
+        self.kvs.set(user_state_key('a_field'), 'new_value')
         self.assertEquals(1, StudentModule.objects.all().count())
         self.assertEquals({'a_field': 'new_value'}, json.loads(StudentModule.objects.all()[0].state))
 
     def test_set_missing_field(self):
-        "Test that setting a new student_state field changes the value"
-        self.kvs.set(student_state_key('not_a_field'), 'new_value')
+        "Test that setting a new user_state field changes the value"
+        self.kvs.set(user_state_key('not_a_field'), 'new_value')
         self.assertEquals(1, StudentModule.objects.all().count())
         self.assertEquals({'a_field': 'a_value', 'not_a_field': 'new_value'}, json.loads(StudentModule.objects.all()[0].state))
 
     def test_delete_existing_field(self):
         "Test that deleting an existing field removes it from the StudentModule"
-        self.kvs.delete(student_state_key('a_field'))
+        self.kvs.delete(user_state_key('a_field'))
         self.assertEquals(1, StudentModule.objects.all().count())
-        self.assertRaises(KeyError, self.kvs.get, student_state_key('not_a_field'))
+        self.assertRaises(KeyError, self.kvs.get, user_state_key('not_a_field'))
 
     def test_delete_missing_field(self):
         "Test that deleting a missing field from an existing StudentModule raises a KeyError"
-        self.assertRaises(KeyError, self.kvs.delete, student_state_key('not_a_field'))
+        self.assertRaises(KeyError, self.kvs.delete, user_state_key('not_a_field'))
         self.assertEquals(1, StudentModule.objects.all().count())
         self.assertEquals({'a_field': 'a_value'}, json.loads(StudentModule.objects.all()[0].state))
 
     def test_has_existing_field(self):
         "Test that `has` returns True for existing fields in StudentModules"
-        self.assertTrue(self.kvs.has(student_state_key('a_field')))
+        self.assertTrue(self.kvs.has(user_state_key('a_field')))
 
     def test_has_missing_field(self):
         "Test that `has` returns False for missing fields in StudentModule"
-        self.assertFalse(self.kvs.has(student_state_key('not_a_field')))
+        self.assertFalse(self.kvs.has(user_state_key('not_a_field')))
 
 
 class TestMissingStudentModule(TestCase):
@@ -187,14 +187,14 @@ class TestMissingStudentModule(TestCase):
 
     def test_get_field_from_missing_student_module(self):
         "Test that getting a field from a missing StudentModule raises a KeyError"
-        self.assertRaises(KeyError, self.kvs.get, student_state_key('a_field'))
+        self.assertRaises(KeyError, self.kvs.get, user_state_key('a_field'))
 
     def test_set_field_in_missing_student_module(self):
         "Test that setting a field in a missing StudentModule creates the student module"
         self.assertEquals(0, len(self.mdc.cache))
         self.assertEquals(0, StudentModule.objects.all().count())
 
-        self.kvs.set(student_state_key('a_field'), 'a_value')
+        self.kvs.set(user_state_key('a_field'), 'a_value')
 
         self.assertEquals(1, len(self.mdc.cache))
         self.assertEquals(1, StudentModule.objects.all().count())
@@ -207,11 +207,11 @@ class TestMissingStudentModule(TestCase):
 
     def test_delete_field_from_missing_student_module(self):
         "Test that deleting a field from a missing StudentModule raises a KeyError"
-        self.assertRaises(KeyError, self.kvs.delete, student_state_key('a_field'))
+        self.assertRaises(KeyError, self.kvs.delete, user_state_key('a_field'))
 
     def test_has_field_for_missing_student_module(self):
         "Test that `has` returns False for missing StudentModules"
-        self.assertFalse(self.kvs.has(student_state_key('a_field')))
+        self.assertFalse(self.kvs.has(user_state_key('a_field')))
 
 
 class StorageTestBase(object):
@@ -286,13 +286,13 @@ class TestContentStorage(StorageTestBase, TestCase):
 
 class TestStudentPrefsStorage(StorageTestBase, TestCase):
     factory = StudentPrefsFactory
-    scope = Scope.student_preferences
-    key_factory = student_prefs_key
+    scope = Scope.preferences
+    key_factory = prefs_key
     storage_class = XModuleStudentPrefsField
 
 
 class TestStudentInfoStorage(StorageTestBase, TestCase):
     factory = StudentInfoFactory
-    scope = Scope.student_info
-    key_factory = student_info_key
+    scope = Scope.user_info
+    key_factory = user_info_key
     storage_class = XModuleStudentInfoField
diff --git a/local-requirements.txt b/local-requirements.txt
index de2d274719..177897f53d 100644
--- a/local-requirements.txt
+++ b/local-requirements.txt
@@ -6,4 +6,4 @@
 # XBlock:
 # Might change frequently, so put it in local-requirements.txt,
 # but conceptually is an external package, so it is in a separate repo.
--e git+ssh://git@github.com/MITx/xmodule-debugger@9a4f883a#egg=XBlock
+-e git+https://github.com/edx/XBlock.git@96d8f5f4#egg=XBlock

From d3e7739b3b4b2f2ea72539148c9c082ac66d0a2b Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Thu, 4 Apr 2013 12:03:08 -0400
Subject: [PATCH 17/19] add user name and email to progress page

---
 lms/djangoapps/courseware/views.py     | 1 +
 lms/templates/courseware/progress.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py
index b2b0874786..ae15b40d26 100644
--- a/lms/djangoapps/courseware/views.py
+++ b/lms/djangoapps/courseware/views.py
@@ -630,6 +630,7 @@ def progress(request, course_id, student_id=None):
                'courseware_summary': courseware_summary,
                'grade_summary': grade_summary,
                'staff_access': staff_access,
+               'student': student,
                }
     context.update()
 
diff --git a/lms/templates/courseware/progress.html b/lms/templates/courseware/progress.html
index f94e7651f0..9e2a2e5982 100644
--- a/lms/templates/courseware/progress.html
+++ b/lms/templates/courseware/progress.html
@@ -31,7 +31,7 @@ ${progress_graph.body(grade_summary, course.grade_cutoffs, "grade-detail-graph",
 
     <section class="course-info">
       <header>
-        <h1>Course Progress</h1>
+        <h1>Course Progress for Student '${student.username}' (${student.email})</h1>
       </header>
 
       %if not course.disable_progress_graph:

From 02b7ab4fa075ca22caa87722b3dd9b2c73c5fbe8 Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Fri, 29 Mar 2013 12:49:24 -0400
Subject: [PATCH 18/19] Tests to make sure that input_states have the correct
 keys and are not cross-pollinating

---
 .../lib/xmodule/xmodule/tests/test_capa_module.py   | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/common/lib/xmodule/xmodule/tests/test_capa_module.py b/common/lib/xmodule/xmodule/tests/test_capa_module.py
index d94345fe1c..7f334207e7 100644
--- a/common/lib/xmodule/xmodule/tests/test_capa_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_capa_module.py
@@ -838,6 +838,19 @@ class CapaModuleTest(unittest.TestCase):
         # Assert that the encapsulated html contains the original html
         self.assertTrue(html in html_encapsulated)
 
+    def test_input_state_consistency(self):
+        module1 = CapaFactory.create()
+        module2 = CapaFactory.create()
+
+        # check to make sure that the input_state and the keys have the same values
+        module1.set_state_from_lcp()
+        self.assertEqual(module1.lcp.inputs.keys(),module1.input_state.keys())
+
+        module2.set_state_from_lcp()
+
+        intersection = set(module2.input_state.keys()).intersection(set(module1.input_state.keys()))
+        self.assertEqual(len(intersection), 0)
+
     def test_get_problem_html_error(self):
         """
         In production, when an error occurs with the problem HTML

From 42614c69b4cfc1c2477bcd7d43c23d361947c146 Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Thu, 4 Apr 2013 14:16:27 -0400
Subject: [PATCH 19/19] Add space after comma.

---
 common/lib/xmodule/xmodule/tests/test_capa_module.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/tests/test_capa_module.py b/common/lib/xmodule/xmodule/tests/test_capa_module.py
index 7f334207e7..bc5d342646 100644
--- a/common/lib/xmodule/xmodule/tests/test_capa_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_capa_module.py
@@ -844,7 +844,7 @@ class CapaModuleTest(unittest.TestCase):
 
         # check to make sure that the input_state and the keys have the same values
         module1.set_state_from_lcp()
-        self.assertEqual(module1.lcp.inputs.keys(),module1.input_state.keys())
+        self.assertEqual(module1.lcp.inputs.keys(), module1.input_state.keys())
 
         module2.set_state_from_lcp()