From f286152f5ad468eb0d09b2f01c32298791d9eef6 Mon Sep 17 00:00:00 2001
From: aamir-khan <aamir@edx.org>
Date: Wed, 29 Jul 2015 18:49:33 +0500
Subject: [PATCH 1/3] ECOM-1947: updated the middleware to exclude the password
 strings from event logging

---
 common/djangoapps/track/middleware.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/djangoapps/track/middleware.py b/common/djangoapps/track/middleware.py
index ea5cdd51f1..7f26b05494 100644
--- a/common/djangoapps/track/middleware.py
+++ b/common/djangoapps/track/middleware.py
@@ -63,7 +63,7 @@ class TrackMiddleware(object):
             # files when we change this.
 
             censored_strings = ['password', 'newpassword', 'new_password',
-                                'oldpassword', 'old_password']
+                                'oldpassword', 'old_password', 'new_password1', 'new_password2']
             post_dict = dict(request.POST)
             get_dict = dict(request.GET)
             for string in censored_strings:

From 96e14e3f8b7b86cdb7115c57cc1d63979f93f46e Mon Sep 17 00:00:00 2001
From: Andy Armstrong <andya@edx.org>
Date: Fri, 31 Jul 2015 19:40:04 -0400
Subject: [PATCH 2/3] Fix forums escaping bug

TNL-2919
---
 .../view/discussion_thread_list_view_spec.coffee           | 7 +++++++
 .../templates/discussion/thread-list-item.underscore       | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/common/static/coffee/spec/discussion/view/discussion_thread_list_view_spec.coffee b/common/static/coffee/spec/discussion/view/discussion_thread_list_view_spec.coffee
index c2dc5f78dd..d88f3367dc 100644
--- a/common/static/coffee/spec/discussion/view/discussion_thread_list_view_spec.coffee
+++ b/common/static/coffee/spec/discussion/view/discussion_thread_list_view_spec.coffee
@@ -224,6 +224,13 @@ describe "DiscussionThreadListView", ->
             checkThreadsOrdering(view, sort_order, type)
             expect(view.$el.find(".forum-nav-thread-comments-count:visible").length).toEqual(if type == "votes" then 0 else 4)
             expect(view.$el.find(".forum-nav-thread-votes-count:visible").length).toEqual(if type == "votes" then 4 else 0)
+            if type == "votes"
+                expect(
+                    _.map(
+                        view.$el.find(".forum-nav-thread-votes-count"),
+                        (element) -> $(element).text().trim()
+                    )
+                ).toEqual(["+25 votes", "+20 votes", "+42 votes", "+12 votes"])
 
         it "with sort preference date", ->
             checkRender(@threads, "date", ["Thread1", "Thread4", "Thread2", "Thread3"])
diff --git a/common/static/common/templates/discussion/thread-list-item.underscore b/common/static/common/templates/discussion/thread-list-item.underscore
index 335085fbc3..8e271cd1fd 100644
--- a/common/static/common/templates/discussion/thread-list-item.underscore
+++ b/common/static/common/templates/discussion/thread-list-item.underscore
@@ -64,7 +64,7 @@
       );
       %>
       <span class="forum-nav-thread-votes-count">
-      +<%- interpolate(fmt, {
+      +<%= interpolate(fmt, {
                votes_count: votes['up_count'],
                span_start: '<span class="sr">',
                span_end: '</span>'

From 90fcf4646a8f7519a4686cfe238ded5c4eec4b76 Mon Sep 17 00:00:00 2001
From: Marco Morales <marco@edx.org>
Date: Fri, 31 Jul 2015 15:48:25 -0400
Subject: [PATCH 3/3] adds back in correct and incorrect styling for
 annotations problems

---
 .../lib/xmodule/xmodule/css/capa/display.scss | 44 +++++++++++++++----
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/common/lib/xmodule/xmodule/css/capa/display.scss b/common/lib/xmodule/xmodule/css/capa/display.scss
index 3082c2392d..cf441cb462 100644
--- a/common/lib/xmodule/xmodule/css/capa/display.scss
+++ b/common/lib/xmodule/xmodule/css/capa/display.scss
@@ -17,6 +17,7 @@
 // * +Problem - Annotation
 // * +Problem - Choice Text Group
 // * +Problem - Image Input Overrides
+// * +Problem - Annotation Problem Overrides
 
 // +Variables - Capa
 // ====================
@@ -464,15 +465,6 @@ div.problem {
         background: url('../images/correct-icon.png') center center no-repeat;
       }
 
-      &.partially-correct {
-        display: inline-block;
-        position: relative;
-        top: 6px;
-        width: 25px;
-        height: 20px;
-        background: url('../images/partially-correct-icon.png') center center no-repeat;
-      }
-
       &.incomplete, &.ui-icon-close {
         display: inline-block;
         position: relative;
@@ -1378,10 +1370,44 @@ div.problem .imageinput.capa_inputtype {
     width: 25px;
     height: 20px;
   }
+
   .correct {
     background: url('../images/correct-icon.png') center center no-repeat;
   }
+
   .incorrect {
     background: url('../images/incorrect-icon.png') center center no-repeat;
   }
+
+  .partially-correct {
+    background: url('../images/partially-correct-icon.png') center center no-repeat;
+  }
 }
+
+// +Problem - Annotation Problem Overrides
+// ====================
+
+// NOTE: temporary override until annotation problem inputs use same base html structure as other common capa input types.
+div.problem .annotation-input {
+
+  .tag-status {
+    display: inline-block;
+    position: relative;
+    top: 3px;
+    width: 25px;
+    height: 20px;
+  }
+
+  .correct {
+    background: url('../images/correct-icon.png') center center no-repeat;
+  }
+
+  .incorrect {
+    background: url('../images/incorrect-icon.png') center center no-repeat;
+  }
+
+  .partially-correct {
+    background: url('../images/partially-correct-icon.png') center center no-repeat;
+  }
+}
+