From f9fe00ff6c0dfc0af36a7116543dcdba09e130b1 Mon Sep 17 00:00:00 2001
From: Waheed Ahmed <waheed.ahmed@arbisoft.com>
Date: Fri, 5 Jun 2015 21:41:42 +0500
Subject: [PATCH 1/8] Fixed youtube video was not loading even youtube is
 available. TNL-2361

---
 common/lib/xmodule/xmodule/js/src/video/01_initialize.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/video/01_initialize.js b/common/lib/xmodule/xmodule/js/src/video/01_initialize.js
index 05654966f5..fc112b939b 100644
--- a/common/lib/xmodule/xmodule/js/src/video/01_initialize.js
+++ b/common/lib/xmodule/xmodule/js/src/video/01_initialize.js
@@ -532,12 +532,9 @@ function (VideoPlayer, VideoStorage, i18n) {
 
             this.youtubeXhr
                 .always(function (json, status) {
-                    var err = $.isPlainObject(json.error) ||
-                                (
-                                    status !== 'success' &&
-                                    status !== 'notmodified'
-                                );
-                    if (err) {
+                    // It will work for both if statusCode is 200 or 410.
+                    var didSucceed = (json.error && json.error.code === 410) || status === 'success' || status === 'notmodified';
+                    if (!didSucceed) {
                         console.log(
                             '[Video info]: YouTube returned an error for ' +
                             'video with id "' + id + '".'

From e47c97b465930f5e23ab2ec8540033df1fbfeccd Mon Sep 17 00:00:00 2001
From: Chris Dodge <cdodge@edx.org>
Date: Sun, 7 Jun 2015 17:43:10 -0400
Subject: [PATCH 2/8] make courses.html also honor the ENABLE_COURSE_DISCOVERY
 feature flag

---
 lms/djangoapps/branding/tests/test_page.py | 46 +++++++++++++
 lms/envs/bok_choy.env.json                 |  3 +-
 lms/envs/bok_choy.py                       |  3 +
 lms/static/sass/multicourse/_courses.scss  | 78 ++++++++++++++++------
 lms/templates/courseware/courses.html      |  8 ++-
 5 files changed, 116 insertions(+), 22 deletions(-)

diff --git a/lms/djangoapps/branding/tests/test_page.py b/lms/djangoapps/branding/tests/test_page.py
index 199784da06..ac4357e4f0 100644
--- a/lms/djangoapps/branding/tests/test_page.py
+++ b/lms/djangoapps/branding/tests/test_page.py
@@ -198,6 +198,52 @@ class IndexPageCourseCardsSortingTests(ModuleStoreTestCase):
         )
         self.factory = RequestFactory()
 
+    @patch('student.views.render_to_response', RENDER_MOCK)
+    @patch('courseware.views.render_to_response', RENDER_MOCK)
+    @patch.dict('django.conf.settings.FEATURES', {'ENABLE_COURSE_DISCOVERY': False})
+    def test_course_discovery_off(self):
+        """
+        Asserts that the Course Discovery UI elements follow the
+        feature flag settings
+        """
+        response = self.client.get('/')
+        self.assertEqual(response.status_code, 200)
+        # assert that the course discovery UI is not present
+        self.assertNotIn('Search for a course', response.content)
+
+        # check the /courses view
+        response = self.client.get(reverse('branding.views.courses'))
+        self.assertEqual(response.status_code, 200)
+
+        # assert that the course discovery UI is not present
+        self.assertNotIn('Search for a course', response.content)
+        self.assertNotIn('<aside aria-label="Refine your search" class="search-facets phone-menu">', response.content)
+
+        # make sure we have the special css class on the section
+        self.assertIn('<section class="courses no-course-discovery">', response.content)
+
+    @patch('student.views.render_to_response', RENDER_MOCK)
+    @patch('courseware.views.render_to_response', RENDER_MOCK)
+    @patch.dict('django.conf.settings.FEATURES', {'ENABLE_COURSE_DISCOVERY': True})
+    def test_course_discovery_on(self):
+        """
+        Asserts that the Course Discovery UI elements follow the
+        feature flag settings
+        """
+        response = self.client.get('/')
+        self.assertEqual(response.status_code, 200)
+        # assert that the course discovery UI is not present
+        self.assertIn('Search for a course', response.content)
+
+        # check the /courses view
+        response = self.client.get(reverse('branding.views.courses'))
+        self.assertEqual(response.status_code, 200)
+
+        # assert that the course discovery UI is not present
+        self.assertIn('Search for a course', response.content)
+        self.assertIn('<aside aria-label="Refine your search" class="search-facets phone-menu">', response.content)
+        self.assertIn('<section class="courses">', response.content)
+
     @patch('student.views.render_to_response', RENDER_MOCK)
     @patch('courseware.views.render_to_response', RENDER_MOCK)
     @patch.dict('django.conf.settings.FEATURES', {'ENABLE_COURSE_DISCOVERY': False})
diff --git a/lms/envs/bok_choy.env.json b/lms/envs/bok_choy.env.json
index 9ec30bf3fa..1eb0cffdba 100644
--- a/lms/envs/bok_choy.env.json
+++ b/lms/envs/bok_choy.env.json
@@ -86,7 +86,8 @@
         "ALLOW_AUTOMATED_SIGNUPS": true,
         "AUTOMATIC_AUTH_FOR_TESTING": true,
         "MODE_CREATION_FOR_TESTING": true,
-        "AUTOMATIC_VERIFY_STUDENT_IDENTITY_FOR_TESTING": true
+        "AUTOMATIC_VERIFY_STUDENT_IDENTITY_FOR_TESTING": true,
+        "ENABLE_COURSE_DISCOVERY": true
     },
     "FEEDBACK_SUBMISSION_EMAIL": "",
     "GITHUB_REPO_ROOT": "** OVERRIDDEN **",
diff --git a/lms/envs/bok_choy.py b/lms/envs/bok_choy.py
index 4eacabf257..26e0852826 100644
--- a/lms/envs/bok_choy.py
+++ b/lms/envs/bok_choy.py
@@ -94,6 +94,9 @@ FEATURES['MILESTONES_APP'] = True
 # Enable pre-requisite course
 FEATURES['ENABLE_PREREQUISITE_COURSES'] = True
 
+# Enable Course Discovery
+FEATURES['ENABLE_COURSE_DISCOVERY'] = True
+
 # Enable student notes
 FEATURES['ENABLE_EDXNOTES'] = True
 
diff --git a/lms/static/sass/multicourse/_courses.scss b/lms/static/sass/multicourse/_courses.scss
index a3b4a97c9b..b1686dff19 100644
--- a/lms/static/sass/multicourse/_courses.scss
+++ b/lms/static/sass/multicourse/_courses.scss
@@ -41,38 +41,78 @@ $facet-background-color: #007db8;
 
     .courses {
       @include rtl() { $layout-direction: "RTL"; }
-      @include span-columns(9);
-
-      @include media($bp-medium) {
-        @include span-columns(4);
-      }
-
-      @include media($bp-large) {
-        @include span-columns(8);
-      }
-
-      @include media($bp-huge) {
-        @include span-columns(9);
-      }
 
       .courses-listing .courses-listing-item {
         @include fill-parent();
         margin: ($baseline*0.75) 0 ($baseline*1.5) 0;
         max-height: $course-card-height;
+      }
+
+      /* Style grid settings if course discovery turned on */
+      &:not(.no-course-discovery) {
+        @include span-columns(9);
 
         @include media($bp-medium) {
-          @include span-columns(8); // 4 of 8
-          @include omega(1n);
+          @include span-columns(4);
         }
 
         @include media($bp-large) {
-          @include span-columns(6); // 6 of 12
-          @include omega(2n);
+          @include span-columns(8);
         }
 
         @include media($bp-huge) {
-          @include span-columns(4); // 4 of 12
-          @include omega(3n);
+          @include span-columns(9);
+        }
+
+        .courses-listing .courses-listing-item {
+          @include media($bp-medium) {
+            @include span-columns(8); // 4 of 8
+            @include omega(1n);
+          }
+
+          @include media($bp-large) {
+            @include span-columns(6); // 6 of 12
+            @include omega(2n);
+          }
+
+          @include media($bp-huge) {
+            @include span-columns(4); // 4 of 12
+            @include omega(3n);
+          }
+        }
+      }
+
+      /* Style grid settings if course discovery turned off */
+      &.no-course-discovery{
+        @include span-columns(12);
+
+        @include media($bp-medium) {
+          @include span-columns(8);
+        }
+
+        @include media($bp-large) {
+          @include span-columns(12);
+        }
+
+        @include media($bp-huge) {
+          @include span-columns(12);
+        }
+
+        .courses-listing .courses-listing-item {
+          @include media($bp-medium) {
+            @include span-columns(4); // 4 of 8
+            @include omega(2n);
+          }
+
+          @include media($bp-large) {
+            @include span-columns(4); // 4 of 12
+            @include omega(3n);
+          }
+
+          @include media($bp-huge) {
+            @include span-columns(3); // 3 of 12
+            @include omega(4n);
+          }
         }
       }
     }
diff --git a/lms/templates/courseware/courses.html b/lms/templates/courseware/courses.html
index 6bea70be95..06f9c97bf0 100644
--- a/lms/templates/courseware/courses.html
+++ b/lms/templates/courseware/courses.html
@@ -29,7 +29,7 @@
 <%block name="pagetitle">${_("Courses")}</%block>
 <%
   platform_name = microsite.get_value('platform_name', settings.PLATFORM_NAME)
-
+  course_discovery_enabled = settings.FEATURES.get('ENABLE_COURSE_DISCOVERY')
   if self.stanford_theme_enabled():
     course_index_overlay_text = _("Explore free courses from {university_name}.").format(university_name="Stanford University")
     logo_file = static.url('themes/stanford/images/seal.png')
@@ -66,6 +66,7 @@
 
   <section class="courses-container">
 
+    % if course_discovery_enabled:
     <div id="discovery-form" role="search" aria-label="course">
       <form>
         <input class="discovery-input" placeholder="${_('Search for a course')}" type="text"/><!-- removes spacing
@@ -83,8 +84,9 @@
 
     <div id="filter-bar" class="filters hide-phone">
     </div>
+    % endif
 
-    <section class="courses">
+    <section class="courses${'' if course_discovery_enabled else ' no-course-discovery'}">
       <ul class="courses-listing">
         %for course in courses:
         <li class="courses-listing-item">
@@ -95,8 +97,10 @@
     </section>
 
 
+    % if course_discovery_enabled:
     <aside aria-label="${_('Refine your search')}" class="search-facets phone-menu">
     </aside>
+    % endif
 
   </section>
 </section>

From a224d06a8935b4b3e608ef317c246a2ee097efad Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Mon, 8 Jun 2015 10:10:45 -0400
Subject: [PATCH 3/8] Allow multiple external_link tabs for one course.

---
 lms/djangoapps/courseware/tabs.py            | 1 +
 lms/djangoapps/courseware/tests/test_tabs.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lms/djangoapps/courseware/tabs.py b/lms/djangoapps/courseware/tabs.py
index 7bb9f15ea5..497442cfc1 100644
--- a/lms/djangoapps/courseware/tabs.py
+++ b/lms/djangoapps/courseware/tabs.py
@@ -234,6 +234,7 @@ class ExternalLinkCourseViewType(EnrolledCourseViewType):
     name = 'external_link'
     priority = None
     is_default = False    # An external link tab is not added to a course by default
+    allow_multiple = True
 
     @classmethod
     def create_tab(cls, tab_dict):
diff --git a/lms/djangoapps/courseware/tests/test_tabs.py b/lms/djangoapps/courseware/tests/test_tabs.py
index 27900d2636..6cafa88f42 100644
--- a/lms/djangoapps/courseware/tests/test_tabs.py
+++ b/lms/djangoapps/courseware/tests/test_tabs.py
@@ -510,6 +510,7 @@ class TabListTestCase(TabTestCase):
                 {'type': CourseInfoViewType.name, 'name': 'fake_name'},
                 {'type': 'discussion', 'name': 'fake_name'},
                 {'type': ExternalLinkCourseViewType.name, 'name': 'fake_name', 'link': 'fake_link'},
+                {'type': ExternalLinkCourseViewType.name, 'name': 'fake_name', 'link': 'fake_link'},
                 {'type': 'textbooks'},
                 {'type': 'pdf_textbooks'},
                 {'type': 'html_textbooks'},

From 445d0dabb6a40d2f0aa4afbe6bfceddfd771e201 Mon Sep 17 00:00:00 2001
From: jsa <jsa@edx.org>
Date: Thu, 4 Jun 2015 17:23:47 -0400
Subject: [PATCH 4/8] Correct deactivation logic in enrollment api and test.

XCOM-396
---
 .../djangoapps/enrollment/tests/test_views.py | 57 ++++++++++++++++++-
 common/djangoapps/enrollment/views.py         | 18 +++++-
 2 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/common/djangoapps/enrollment/tests/test_views.py b/common/djangoapps/enrollment/tests/test_views.py
index c7fcd125aa..d119a8e21d 100644
--- a/common/djangoapps/enrollment/tests/test_views.py
+++ b/common/djangoapps/enrollment/tests/test_views.py
@@ -2,6 +2,7 @@
 Tests for user enrollment.
 """
 import json
+import itertools
 import unittest
 import datetime
 
@@ -91,11 +92,11 @@ class EnrollmentTestMixin(object):
 
         return response
 
-    def assert_enrollment_activation(self, expected_activation, expected_mode=CourseMode.VERIFIED):
+    def assert_enrollment_activation(self, expected_activation, expected_mode):
         """Change an enrollment's activation and verify its activation and mode are as expected."""
         self.assert_enrollment_status(
             as_server=True,
-            mode=None,
+            mode=expected_mode,
             is_active=expected_activation,
             expected_status=status.HTTP_200_OK
         )
@@ -603,6 +604,58 @@ class EnrollmentTest(EnrollmentTestMixin, ModuleStoreTestCase, APITestCase):
         self.assertTrue(is_active)
         self.assertEqual(course_mode, CourseMode.HONOR)
 
+    @ddt.data(*itertools.product(
+        (CourseMode.HONOR, CourseMode.VERIFIED),
+        (CourseMode.HONOR, CourseMode.VERIFIED),
+        (True, False),
+        (True, False),
+    ))
+    @ddt.unpack
+    def test_change_mode_from_server(self, old_mode, new_mode, old_is_active, new_is_active):
+        """
+        Server-to-server calls should be allowed to change the mode of any
+        enrollment, as long as the enrollment is not being deactivated during
+        the same call (this is assumed to be an error on the client's side).
+        """
+        for mode in [CourseMode.HONOR, CourseMode.VERIFIED]:
+            CourseModeFactory.create(
+                course_id=self.course.id,
+                mode_slug=mode,
+                mode_display_name=mode,
+            )
+
+        # Set up the initial enrollment
+        self.assert_enrollment_status(as_server=True, mode=old_mode, is_active=old_is_active)
+        course_mode, is_active = CourseEnrollment.enrollment_mode_for_user(self.user, self.course.id)
+        self.assertEqual(is_active, old_is_active)
+        self.assertEqual(course_mode, old_mode)
+
+        expected_status = status.HTTP_400_BAD_REQUEST if (
+            old_mode != new_mode and
+            old_is_active != new_is_active and
+            not new_is_active
+        ) else status.HTTP_200_OK
+
+        # simulate the server-server api call under test
+        response = self.assert_enrollment_status(
+            as_server=True,
+            mode=new_mode,
+            is_active=new_is_active,
+            expected_status=expected_status,
+        )
+
+        course_mode, is_active = CourseEnrollment.enrollment_mode_for_user(self.user, self.course.id)
+        if expected_status == status.HTTP_400_BAD_REQUEST:
+            # nothing should have changed
+            self.assertEqual(is_active, old_is_active)
+            self.assertEqual(course_mode, old_mode)
+            # error message should contain specific text.  Otto checks for this text in the message.
+            self.assertRegexpMatches(json.loads(response.content)['message'], 'Enrollment mode mismatch')
+        else:
+            # call should have succeeded
+            self.assertEqual(is_active, new_is_active)
+            self.assertEqual(course_mode, new_mode)
+
     def test_change_mode_invalid_user(self):
         """
         Attempts to change an enrollment for a non-existent user should result in an HTTP 404 for non-server users,
diff --git a/common/djangoapps/enrollment/views.py b/common/djangoapps/enrollment/views.py
index a5c610c5d5..fca223264f 100644
--- a/common/djangoapps/enrollment/views.py
+++ b/common/djangoapps/enrollment/views.py
@@ -3,6 +3,8 @@ The Enrollment API Views should be simple, lean HTTP endpoints for API access. T
 consist primarily of authentication, request validation, and serialization.
 
 """
+import logging
+
 from ipware.ip import get_ip
 from django.core.exceptions import ObjectDoesNotExist
 from django.utils.decorators import method_decorator
@@ -31,6 +33,9 @@ from enrollment.errors import (
 from student.models import User
 
 
+log = logging.getLogger(__name__)
+
+
 class EnrollmentCrossDomainSessionAuth(SessionAuthenticationAllowInactiveUser, SessionAuthenticationCrossDomainCsrf):
     """Session authentication that allows inactive users and cross-domain requests. """
     pass
@@ -421,7 +426,18 @@ class EnrollmentListView(APIView, ApiKeyPermissionMixIn):
                 )
 
             enrollment = api.get_enrollment(username, unicode(course_id))
-            if has_api_key_permissions and enrollment and enrollment['mode'] != mode:
+            mode_changed = enrollment and mode is not None and enrollment['mode'] != mode
+            active_changed = enrollment and is_active is not None and enrollment['is_active'] != is_active
+            if has_api_key_permissions and (mode_changed or active_changed):
+                if mode_changed and active_changed and not is_active:
+                    # if the requester wanted to deactivate but specified the wrong mode, fail
+                    # the request (on the assumption that the requester had outdated information
+                    # about the currently active enrollment).
+                    msg = u"Enrollment mode mismatch: active mode={}, requested mode={}. Won't deactivate.".format(
+                        enrollment["mode"], mode
+                    )
+                    log.warning(msg)
+                    return Response(status=status.HTTP_400_BAD_REQUEST, data={"message": msg})
                 response = api.update_enrollment(username, unicode(course_id), mode=mode, is_active=is_active)
             else:
                 # Will reactivate inactive enrollments.

From f4b2c197db8a2b01a5803bfaff0c434c3f0fc2b9 Mon Sep 17 00:00:00 2001
From: jsa <jsa@edx.org>
Date: Fri, 5 Jun 2015 15:45:17 -0400
Subject: [PATCH 5/8] =?UTF-8?q?don=E2=80=99t=20trigger=20a=20refund=20requ?=
 =?UTF-8?q?est=20in=20otto,=20if=20otto=20requested=20unenrollment.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

XCOM-396
---
 lms/djangoapps/commerce/signals.py            | 8 ++++++++
 lms/djangoapps/commerce/tests/test_signals.py | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/lms/djangoapps/commerce/signals.py b/lms/djangoapps/commerce/signals.py
index 0d54ab4e7d..b135325dca 100644
--- a/lms/djangoapps/commerce/signals.py
+++ b/lms/djangoapps/commerce/signals.py
@@ -5,6 +5,7 @@ import logging
 from urlparse import urljoin
 
 from django.conf import settings
+from django.contrib.auth.models import AnonymousUser
 from django.core.mail import EmailMultiAlternatives
 from django.dispatch import receiver
 from django.utils.translation import ugettext as _
@@ -32,6 +33,13 @@ def handle_unenroll_done(sender, course_enrollment=None, skip_refund=False, **kw
     if course_enrollment and course_enrollment.refundable():
         try:
             request_user = get_request_user() or course_enrollment.user
+            if isinstance(request_user, AnonymousUser):
+                # Assume the request was initiated via server-to-server
+                # api call (presumably Otto).  In this case we cannot
+                # construct a client to call Otto back anyway, because
+                # the client does not work anonymously, and furthermore,
+                # there's certainly no need to inform Otto about this request.
+                return
             refund_seat(course_enrollment, request_user)
         except:  # pylint: disable=bare-except
             # don't assume the signal was fired with `send_robust`.
diff --git a/lms/djangoapps/commerce/tests/test_signals.py b/lms/djangoapps/commerce/tests/test_signals.py
index 85eb7cb591..014d572a57 100644
--- a/lms/djangoapps/commerce/tests/test_signals.py
+++ b/lms/djangoapps/commerce/tests/test_signals.py
@@ -1,6 +1,7 @@
 """
 Tests for signal handling in commerce djangoapp.
 """
+from django.contrib.auth.models import AnonymousUser
 from django.test import TestCase
 from django.test.utils import override_settings
 
@@ -109,6 +110,12 @@ class TestRefundSignal(TestCase):
         self.assertTrue(mock_refund_seat.called)
         self.assertEqual(mock_refund_seat.call_args[0], (self.course_enrollment, self.requester))
 
+        # HTTP user is another server (AnonymousUser): do not try to initiate a refund at all.
+        mock_get_request_user.return_value = AnonymousUser()
+        mock_refund_seat.reset_mock()
+        self.send_signal()
+        self.assertFalse(mock_refund_seat.called)
+
     @mock.patch('commerce.signals.log.warning')
     def test_not_authorized_warning(self, mock_log_warning):
         """

From ecc3473d36b3c7a360e260f8962e21cb01eb1c39 Mon Sep 17 00:00:00 2001
From: Syed Hassan Raza <shrhawk88@gmail.com>
Date: Thu, 21 May 2015 13:23:03 +0500
Subject: [PATCH 6/8] transcript name param url

---
 .../tests/test_transcripts_utils.py           | 101 ++++++++++++++++++
 .../xmodule/video_module/transcripts_utils.py |  33 +++++-
 2 files changed, 133 insertions(+), 1 deletion(-)

diff --git a/cms/djangoapps/contentstore/tests/test_transcripts_utils.py b/cms/djangoapps/contentstore/tests/test_transcripts_utils.py
index ef762471d1..82d7a2e91c 100644
--- a/cms/djangoapps/contentstore/tests/test_transcripts_utils.py
+++ b/cms/djangoapps/contentstore/tests/test_transcripts_utils.py
@@ -270,6 +270,107 @@ class TestDownloadYoutubeSubs(ModuleStoreTestCase):
 
         self.clear_sub_content(good_youtube_sub)
 
+    @patch('xmodule.video_module.transcripts_utils.requests.get')
+    def test_get_transcript_name_youtube_server_success(self, mock_get):
+        """
+        Get transcript name from transcript_list fetch from youtube server api
+        depends on language code, default language in YOUTUBE Text Api is "en"
+        """
+        youtube_text_api = copy.deepcopy(settings.YOUTUBE['TEXT_API'])
+        youtube_text_api['params']['v'] = 'dummy_video_id'
+        response_success = """
+        <transcript_list>
+            <track id="1" name="Custom" lang_code="en" />
+            <track id="0" name="Custom1" lang_code="en-GB"/>
+        </transcript_list>
+        """
+        mock_get.return_value = Mock(status_code=200, text=response_success, content=response_success)
+
+        transcript_name = transcripts_utils.youtube_video_transcript_name(youtube_text_api)
+        self.assertEqual(transcript_name, 'Custom')
+
+    @patch('xmodule.video_module.transcripts_utils.requests.get')
+    def test_get_transcript_name_youtube_server_no_transcripts(self, mock_get):
+        """
+        When there are no transcripts of video transcript name will be None
+        """
+        youtube_text_api = copy.deepcopy(settings.YOUTUBE['TEXT_API'])
+        youtube_text_api['params']['v'] = 'dummy_video_id'
+        response_success = "<transcript_list></transcript_list>"
+        mock_get.return_value = Mock(status_code=200, text=response_success, content=response_success)
+
+        transcript_name = transcripts_utils.youtube_video_transcript_name(youtube_text_api)
+        self.assertIsNone(transcript_name)
+
+    @patch('xmodule.video_module.transcripts_utils.requests.get')
+    def test_get_transcript_name_youtube_server_language_not_exist(self, mock_get):
+        """
+        When the language does not exist in transcript_list transcript name will be None
+        """
+        youtube_text_api = copy.deepcopy(settings.YOUTUBE['TEXT_API'])
+        youtube_text_api['params']['v'] = 'dummy_video_id'
+        youtube_text_api['params']['lang'] = 'abc'
+        response_success = """
+        <transcript_list>
+            <track id="1" name="Custom" lang_code="en" />
+            <track id="0" name="Custom1" lang_code="en-GB"/>
+        </transcript_list>
+        """
+        mock_get.return_value = Mock(status_code=200, text=response_success, content=response_success)
+
+        transcript_name = transcripts_utils.youtube_video_transcript_name(youtube_text_api)
+        self.assertIsNone(transcript_name)
+
+    def mocked_requests_get(*args, **kwargs):
+        """
+        This method will be used by the mock to replace requests.get
+        """
+        # pylint: disable=no-method-argument
+        response_transcript_list = """
+        <transcript_list>
+            <track id="1" name="Custom" lang_code="en" />
+            <track id="0" name="Custom1" lang_code="en-GB"/>
+        </transcript_list>
+        """
+        response_transcript = textwrap.dedent("""
+        <transcript>
+            <text start="0" dur="0.27"></text>
+            <text start="0.27" dur="2.45">Test text 1.</text>
+            <text start="2.72">Test text 2.</text>
+            <text start="5.43" dur="1.73">Test text 3.</text>
+        </transcript>
+        """)
+
+        if kwargs == {'params': {'lang': 'en', 'v': 'good_id_2'}}:
+            return Mock(status_code=200, text='')
+        elif kwargs == {'params': {'type': 'list', 'v': 'good_id_2'}}:
+            return Mock(status_code=200, text=response_transcript_list, content=response_transcript_list)
+        elif kwargs == {'params': {'lang': 'en', 'v': 'good_id_2', 'name': 'Custom'}}:
+            return Mock(status_code=200, text=response_transcript, content=response_transcript)
+
+        return Mock(status_code=404, text='')
+
+    @patch('xmodule.video_module.transcripts_utils.requests.get', side_effect=mocked_requests_get)
+    def test_downloading_subs_using_transcript_name(self, mock_get):
+        """
+        Download transcript using transcript name in url
+        """
+        good_youtube_sub = 'good_id_2'
+        self.clear_sub_content(good_youtube_sub)
+
+        transcripts_utils.download_youtube_subs(good_youtube_sub, self.course, settings)
+        mock_get.assert_any_call(
+            'http://video.google.com/timedtext',
+            params={'lang': 'en', 'v': 'good_id_2', 'name': 'Custom'}
+        )
+
+        # Check asset status after import of transcript.
+        filename = 'subs_{0}.srt.sjson'.format(good_youtube_sub)
+        content_location = StaticContent.compute_location(self.course.id, filename)
+        self.assertTrue(contentstore().find(content_location))
+
+        self.clear_sub_content(good_youtube_sub)
+
 
 class TestGenerateSubsFromSource(TestDownloadYoutubeSubs):
     """Tests for `generate_subs_from_source` function."""
diff --git a/common/lib/xmodule/xmodule/video_module/transcripts_utils.py b/common/lib/xmodule/xmodule/video_module/transcripts_utils.py
index fd82ed3452..bf7d39b7c9 100644
--- a/common/lib/xmodule/xmodule/video_module/transcripts_utils.py
+++ b/common/lib/xmodule/xmodule/video_module/transcripts_utils.py
@@ -94,7 +94,32 @@ def save_subs_to_store(subs, subs_id, item, language='en'):
     return save_to_store(filedata, filename, 'application/json', item.location)
 
 
-def get_transcripts_from_youtube(youtube_id, settings, i18n):
+def youtube_video_transcript_name(youtube_text_api):
+    """
+    Get the transcript name from available transcripts of video
+    with respect to language from youtube server
+    """
+    # pylint: disable=no-member
+    utf8_parser = etree.XMLParser(encoding='utf-8')
+
+    transcripts_param = {'type': 'list', 'v': youtube_text_api['params']['v']}
+    lang = youtube_text_api['params']['lang']
+    # get list of transcripts of specific video
+    # url-form
+    # http://video.google.com/timedtext?type=list&v={VideoId}
+    youtube_response = requests.get('http://' + youtube_text_api['url'], params=transcripts_param)
+    if youtube_response.status_code == 200 and youtube_response.text:
+        # pylint: disable=no-member
+        youtube_data = etree.fromstring(youtube_response.content, parser=utf8_parser)
+        # iterate all transcripts information from youtube server
+        for element in youtube_data:
+            # search specific language code such as 'en' in transcripts info list
+            if element.tag == 'track' and element.get('lang_code', '') == lang:
+                return element.get('name')
+    return None
+
+
+def get_transcripts_from_youtube(youtube_id, settings, i18n, youtube_transcript_name=''):
     """
     Gets transcripts from youtube for youtube_id.
 
@@ -109,6 +134,12 @@ def get_transcripts_from_youtube(youtube_id, settings, i18n):
 
     youtube_text_api = copy.deepcopy(settings.YOUTUBE['TEXT_API'])
     youtube_text_api['params']['v'] = youtube_id
+    # if the transcript name is not empty on youtube server we have to pass
+    # name param in url in order to get transcript
+    # example http://video.google.com/timedtext?lang=en&v={VideoId}&name={transcript_name}
+    youtube_transcript_name = youtube_video_transcript_name(youtube_text_api)
+    if youtube_transcript_name:
+        youtube_text_api['params']['name'] = youtube_transcript_name
     data = requests.get('http://' + youtube_text_api['url'], params=youtube_text_api['params'])
 
     if data.status_code != 200 or not data.text:

From b328c0dcdc48fb978eba305643afd8ede7d814d9 Mon Sep 17 00:00:00 2001
From: Waheed Ahmed <waheed.ahmed@arbisoft.com>
Date: Wed, 10 Jun 2015 21:03:52 +0500
Subject: [PATCH 7/8] Fixed slow transaction on xblock outline handler.
 TNL-2425

---
 cms/djangoapps/contentstore/views/item.py     | 15 +++++++------
 .../contentstore/views/tests/test_item.py     | 22 +++++++++++++++++++
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/cms/djangoapps/contentstore/views/item.py b/cms/djangoapps/contentstore/views/item.py
index ae197ee0f2..f0d7b80128 100644
--- a/cms/djangoapps/contentstore/views/item.py
+++ b/cms/djangoapps/contentstore/views/item.py
@@ -332,13 +332,14 @@ def xblock_outline_handler(request, usage_key_string):
     response_format = request.REQUEST.get('format', 'html')
     if response_format == 'json' or 'application/json' in request.META.get('HTTP_ACCEPT', 'application/json'):
         store = modulestore()
-        root_xblock = store.get_item(usage_key)
-        return JsonResponse(create_xblock_info(
-            root_xblock,
-            include_child_info=True,
-            course_outline=True,
-            include_children_predicate=lambda xblock: not xblock.category == 'vertical'
-        ))
+        with store.bulk_operations(usage_key.course_key):
+            root_xblock = store.get_item(usage_key)
+            return JsonResponse(create_xblock_info(
+                root_xblock,
+                include_child_info=True,
+                course_outline=True,
+                include_children_predicate=lambda xblock: not xblock.category == 'vertical'
+            ))
     else:
         return Http404
 
diff --git a/cms/djangoapps/contentstore/views/tests/test_item.py b/cms/djangoapps/contentstore/views/tests/test_item.py
index 3632fd4d75..c29bee1f1b 100644
--- a/cms/djangoapps/contentstore/views/tests/test_item.py
+++ b/cms/djangoapps/contentstore/views/tests/test_item.py
@@ -1410,6 +1410,28 @@ class TestXBlockInfo(ItemTest):
         json_response = json.loads(resp.content)
         self.validate_course_xblock_info(json_response, course_outline=True)
 
+    def test_xblock_outline_handler_mongo_calls(self):
+        expected_calls = 5
+        with self.store.default_store(ModuleStoreEnum.Type.split):
+            course = CourseFactory.create()
+            chapter = ItemFactory.create(
+                parent_location=course.location, category='chapter', display_name='Week 1'
+            )
+            outline_url = reverse_usage_url('xblock_outline_handler', chapter.location)
+            with check_mongo_calls(expected_calls):
+                self.client.get(outline_url, HTTP_ACCEPT='application/json')
+
+            sequential = ItemFactory.create(
+                parent_location=chapter.location, category='sequential', display_name='Sequential 1'
+            )
+
+            ItemFactory.create(
+                parent_location=sequential.location, category='vertical', display_name='Vertical 1'
+            )
+            # calls should be same after adding two new children.
+            with check_mongo_calls(expected_calls):
+                self.client.get(outline_url, HTTP_ACCEPT='application/json')
+
     def test_entrance_exam_chapter_xblock_info(self):
         chapter = ItemFactory.create(
             parent_location=self.course.location, category='chapter', display_name="Entrance Exam",

From ff849d206a47a8f21a417b53a04088e953b215ea Mon Sep 17 00:00:00 2001
From: AlasdairSwan <alasdair_swan@hotmail.com>
Date: Wed, 10 Jun 2015 12:41:49 -0400
Subject: [PATCH 8/8] Fixes bug with app links in new footer

---
 lms/static/sass/shared/_footer-edx.scss | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/lms/static/sass/shared/_footer-edx.scss b/lms/static/sass/shared/_footer-edx.scss
index 7fcfad4027..42569917a4 100644
--- a/lms/static/sass/shared/_footer-edx.scss
+++ b/lms/static/sass/shared/_footer-edx.scss
@@ -80,12 +80,15 @@ footer#footer-edx-v3 {
     }
   }
 
-  .social-media-links,
   .mobile-app-links {
     @include clearfix();
+    position: relative;
+    width: 260px;
+    height: 42px;
   }
 
   .social-media-links {
+    @include clearfix();
     margin-bottom: 30px;
   }
 
@@ -119,17 +122,20 @@ footer#footer-edx-v3 {
   }
 
   .app-link {
-    @include float(left);
-    @include margin-right(10px);
-    position: relative;
-    display: inline-block;
+    position: absolute;
+    top: 0;
+
+    &:first-of-type {
+      @include left(0);
+    }
 
     &:last-of-type {
-      @include margin-right(0);
+      @include right(0);
     }
 
     img {
       height: 40px;
+      max-width: 200px;
     }
   }