Merge branch 'release'

Conflicts:
	CHANGELOG.rst

CHANGELOG.rst

@@ -14,6 +14,10 @@ assessors to edit the original submitter's work.
 LMS: Fixed a bug that caused links from forum user profile pages to
 threads to lead to 404s if the course id contained a '-' character.
 
+Studio/LMS: Added ability to set due date formatting through Studio's Advanced Settings.
+The key is due_date_display_format, and the value should be a format supported by Python's
+strftime function.
+
 Common: Added configurable backends for tracking events. Tracking events using
 the python logging module is the default backend. Support for MongoDB and a
 Django database is also available.

common/lib/xmodule/xmodule/lti_module.py

@@ -227,17 +227,13 @@ class LTIModule(LTIFields, XModule):
                 body=body,
                 headers=headers)
         except ValueError:  # scheme not in url
-            # Stubbing headers for now:
+            #https://github.com/idan/oauthlib/blob/master/oauthlib/oauth1/rfc5849/signature.py#L136
+            #Stubbing headers for now:
             headers = {
                 u'Content-Type': u'application/x-www-form-urlencoded',
-                u'Authorization': u'oAuth '  # cont..
-                    u'oauth_nonce="80966668944732164491378916897", '  # cont..
-                    u'oauth_timestamp="1378916897", '        # cont..
-                    u'oauth_version="1.0", '                 # cont..
-                    u'oauth_signature_method="HMAC-SHA1", '  # cont..
-                    u'oauth_consumer_key="", '               # cont..
-                    u'oauth_signature="frVp4JuvT1mVXlxktiAUjQ7%2F1cw%3D"',
-            }
+                u'Authorization': u'OAuth oauth_nonce="80966668944732164491378916897", \
+oauth_timestamp="1378916897", oauth_version="1.0", oauth_signature_method="HMAC-SHA1", \
+oauth_consumer_key="", oauth_signature="frVp4JuvT1mVXlxktiAUjQ7%2F1cw%3D"'}
 
         params = headers['Authorization']
         # parse headers to pass to template as part of context:

lms/static/sass/views/_verification.scss

@@ -1661,13 +1661,13 @@
         margin: 0 flex-gutter() 0 0;
 
         .title {
-          @extend .hd-lv4;
+          @extend %hd-lv4;
           margin-bottom: ($baseline/4);
         }
 
         .copy {
-          @extend .t-copy-sub1;
-          @extend .t-weight3;
+          @extend %t-copy-sub1;
+          @extend %t-weight3;
         }
 
         .list-actions {
@@ -1675,7 +1675,7 @@
         }
 
         .action-verify label  {
-          @extend .t-copy-sub1;
+          @extend %t-copy-sub1;
         }
       }
 

lms/templates/discussion/_thread_list_template.html

@@ -4,13 +4,13 @@
         <div class="home">
             <a href="#" class="home-icon">
                 <i class="icon icon-home"></i>
-                <span class="text-sr">${_("Discussion Home")}</span>
+                <span class="sr">${_("Discussion Home")}</span>
             </a>
         </div>
         <div class="browse is-open">
             <a href="#" class="browse-topic-drop-icon">
                 <i class="icon icon-reorder"></i>
-                <span class="text-sr">${_("Discussion Topics")}</span>
+                <span class="sr">${_("Discussion Topics")}</span>
             </a>
             <a href="#" class="browse-topic-drop-btn"><span class="current-board">${_("Show All Discussions")}</span> <span class="drop-arrow">▾</span></a>
         </div>