Merge remote-tracking branch 'origin/release' into merge-release-into-master

Conflicts: requirements/edx/github.txt
2015-01-30 09:44:42 -05:00
parent 869b407e1f 13c36c9097
commit bfcfbfab2f
5 changed files with 22 additions and 12 deletions
--- a/common/djangoapps/embargo/tests/test_middleware.py
+++ b/common/djangoapps/embargo/tests/test_middleware.py
@@ -54,7 +54,7 @@ class EmbargoMiddlewareTests(ModuleStoreTestCase):
        CourseEnrollment.enroll(self.user, self.regular_course.id)
        CourseEnrollment.enroll(self.user, self.embargo_course.id)
        # Text from lms/templates/static_templates/embargo.html
-        self.embargo_text = "Unfortunately, at this time edX must comply with export controls, and we cannot allow you to access this particular course."
+        self.embargo_text = "Unfortunately, at this time edX must comply with export controls, and we cannot allow you to access this course."

        self.patcher = mock.patch.object(pygeoip.GeoIP, 'country_code_by_addr', self.mock_country_code_by_addr)
        self.patcher.start()
--- a/common/static/js/vendor/noreferrer.js
+++ b/common/static/js/vendor/noreferrer.js
@@ -0,0 +1,10 @@
+/*
+ jquery.noreferrer.js, version 0.1.3
+ https://github.com/knu/noreferrer
+
+ Copyright (c) 2011 Akinori MUSHA
+ Licensed under the 2-clause BSD license.
+*/
+(function(){(function(){$.browser.webkit||$.event.add(window,"load",function(){$("a[href][rel~=noreferrer], area[href][rel~=noreferrer]").each(function(){var b,e,c,g,d,f,h;b=this;c=b.href;$.browser.opera?(b.href="http://www.google.com/url?q="+encodeURIComponent(c),b.title||(b.title="Go to "+c)):(d=!1,g=function(){b.href="javascript:void(0)"},f=function(){b.href=c},$(b).bind("mouseout mouseover focus blur",f).mousedown(function(a){a.which===2&&(d=!0)}).blur(function(){d=!1}).mouseup(function(a){if(!(a.which===
+2&&d))return!0;g();d=!1;setTimeout(function(){alert("Middle clicking on this link is disabled");f()},500);return!1}),e="<html><head><meta http-equiv='Refresh' content='0; URL="+$("<p/>").text(c).html()+"' /></head><body></body></html>",$.browser.msie?$(b).click(function(){var a;switch(a=this.target||"_self"){case "_self":case window.name:a=window;break;default:a=window.open(null,a)}a=a.document;a.clear();a.write(e);a.close();return!1}):(h="data:text/html;charset=utf-8,"+
+encodeURIComponent(e),$(b).click(function(){this.href=h;return!0})))})})})()}).call(this);
--- a/lms/templates/footer-edx-new.html
+++ b/lms/templates/footer-edx-new.html
@@ -2,7 +2,6 @@
 <%! from django.core.urlresolvers import reverse %>
 <%! from django.utils.translation import ugettext as _ %>
 <%namespace name='static' file='static_content.html'/>
-
 ## WARNING: These files are specific to edx.org and are not used in installations outside of that domain. Open edX users will want to use the file "footer.html" for any changes or overrides.
 <div class="wrapper wrapper-footer edx-footer edx-footer-new">
  <footer id="footer-global" class="footer-global" role="contentinfo" aria-label="Footer">
@@ -65,31 +64,31 @@
      <div class="footer-follow-links">
        ## Translators: This is the website name of www.twitter.com. Please
        ## translate this the way that Twitter advertises in your language.
-        <a href="${settings.PLATFORM_TWITTER_URL}" title="${_("Twitter")}">
+        <a href="${settings.PLATFORM_TWITTER_URL}" title="${_("Twitter")}" rel="noreferrer">
          <i class="icon fa fa-twitter element-invisible"></i>
          <span class="copy">${_("Twitter")}</span>
        </a>
        ## Translators: This is the website name of www.facebook.com. Please
        ## translate this the way that Facebook advertises in your language.
-        <a href="${settings.PLATFORM_FACEBOOK_ACCOUNT}" title="${_("Facebook")}">
+        <a href="${settings.PLATFORM_FACEBOOK_ACCOUNT}" title="${_("Facebook")}" rel="noreferrer">
          <i class="icon fa fa-facebook element-invisible"></i>
          <span class="copy">${_("Facebook")}</span>
        </a>
        ## Translators: This is the website name of www.meetup.com. Please
        ## translate this the way that Meetup advertises in your language.
-        <a href="${settings.PLATFORM_MEETUP_URL}" title="${_("Meetup")}">
+        <a href="${settings.PLATFORM_MEETUP_URL}" title="${_("Meetup")}" rel="noreferrer">
          <i class="icon fa fa-calendar element-invisible"></i>
          <span class="copy">${_("Meetup")}</span>
        </a>
        ## Translators: This is the website name of www.linked.com. Please
        ## translate this the way that LinkedIn advertises in your language.
-        <a href="${settings.PLATFORM_LINKEDIN_URL}" title="${_("LinkedIn")}">
+        <a href="${settings.PLATFORM_LINKEDIN_URL}" title="${_("LinkedIn")}" rel="noreferrer">
          <i class="icon fa fa-linkedin element-invisible"></i>
          <span class="copy">${_("LinkedIn")}</span>
        </a>
        ## Translators: This is the website name of plus.google.com. Please
        ## translate this the way that Google+ advertises in your language.
-        <a href="${settings.PLATFORM_GOOGLE_PLUS_URL}" title="${_("Google+")}">
+        <a href="${settings.PLATFORM_GOOGLE_PLUS_URL}" title="${_("Google+")}" rel="noreferrer">
          <i class="icon fa fa-google-plus element-invisible"></i>
          <span class="copy">${_("Google+")}</span>
        </a>
@@ -113,3 +112,6 @@
    </div>
  </footer>
 </div>
+
+<script type="text/javascript" src="/static/js/vendor/noreferrer.js" charset="utf-8"></script>
+
--- a/lms/templates/static_templates/embargo.html
+++ b/lms/templates/static_templates/embargo.html
@@ -6,11 +6,9 @@
 <section class="outside-app">
 <p>
 ${_("Our system indicates that you are trying to access this {platform_name} "
-    "course from a country currently subject to U.S. economic and trade "
+    "course from a country or region currently subject to U.S. economic and trade "
    "sanctions. Unfortunately, at this time {platform_name} must comply with "
-    "export controls, and we cannot allow you to access this particular course. "
-    "Feel free to browse our catalogue to find other courses you may be "
-    "interested in taking."
+    "export controls, and we cannot allow you to access this course."
  ).format(
    platform_name=settings.PLATFORM_NAME,
  )}
--- a/requirements/edx/github.txt
+++ b/requirements/edx/github.txt
@@ -22,7 +22,7 @@ git+https://github.com/mitocw/django-cas.git@60a5b8e5a62e63e0d5d224a87f0b489201a

 # Our libraries:
 -e git+https://github.com/edx/XBlock.git@0b865f62f2deaa81b77f819b9b7df0303cb0f70c#egg=XBlock
-e git+https://github.com/edx/codejail.git@2b095e820ff752a108653bb39d518b122f7154db#egg=codejail
+-e git+https://github.com/edx/codejail.git@6b17c33a89bef0ac510926b1d7fea2748b73aadd#egg=codejail
 -e git+https://github.com/edx/js-test-tool.git@v0.1.6#egg=js_test_tool
 -e git+https://github.com/edx/event-tracking.git@0.1.0#egg=event-tracking
 -e git+https://github.com/edx/bok-choy.git@94430eb3e50e84330b81a3f5bc0ba4cc0171516f#egg=bok_choy