Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7835 from edx/release

Browse Source 
Release (DO NOT MERGE)
This commit is contained in:
Adam
2015-04-30 16:24:47 -04:00
parent 22d818e0fb f740bdbe84
commit af3519ce15
15 changed files with 71 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/lib/xmodule/xmodule/js/src/video/00_sjson.js
View File

@@ -79,7 +79,7 @@ function() {
var captions = getCaptions();
if (startTimes.length !== captions.length) {
throw new Exception("video caption and start time arrays do not match in length");
console.warn("video caption and start time arrays do not match in length");
}
// if end is null, then it's been set to

4
common/test/acceptance/tests/lms/test_learner_profile.py
View File

@@ -387,8 +387,8 @@ class OwnLearnerProfilePageTest(LearnerProfileTestMixin, WebAppTest):
Then `about me` field mode should be `edit`
"""
placeholder_value = (
"Tell other edX learners a little about yourself: where you live, what your interests are, "
"why you're taking courses on edX, or what you hope to learn."
"Tell other learners a little about yourself: where you live, what your interests are, "
"why you're taking courses, or what you hope to learn."
)
username, user_id = self.log_in_as_unique_user()