Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,718 Commits 1 Branch 0 Tags
4e0f3d0791dcf5f9dc236e5c70b888dbbcbfaab6
Commit Graph

16718 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carlos Andrés Rocha
4e0f3d0791 Merge pull request #706 from rocha/enable-django-nose-for-all 
Enable the django_nose app by default
 2013-08-16 11:29:43 -07:00
Jay Zoldak
e91205aff3 Merge branch 'release' 
Conflicts:
	common/lib/xmodule/xmodule/video_module.py
 2013-08-16 14:25:03 -04:00
Jay Zoldak
9c67e56d00 Merge pull request #714 from edx/zoldak/hotfix-2013-08-16 
Zoldak/hotfix 2013 08 16
 2013-08-16 11:15:34 -07:00
James Tauber
f3e282e3ed Merge pull request #712 from edx/jtauber/fix-typo 
fixed typo in faculty member settings text
 2013-08-16 10:18:55 -07:00
James Tauber
97083d0f69 fixed typo in faculty member settings 
This was confusing translators as didn't make sense in English
 2013-08-16 11:49:20 -04:00
Adam Palay
0a59cb6598 in grading, if problem cannot be created, return score as none 
Conflicts:
	lms/envs/dev.py
 2013-08-16 11:27:55 -04:00
Peter Baratta
01c743f244 Merge pull request #664 from edx/peterb/fix/math-initial-display 
Fix initial loading bug on `<formulaequationinput />`
 2013-08-16 08:17:03 -07:00
Adam
321fc36e45 Merge pull request #691 from edx/fix/adam/progress-page 
in grading, if problem cannot be created, return score as none
 2013-08-16 07:40:51 -07:00
Adam Palay
8aee225136 in grading, if problem cannot be created, return score as none 2013-08-16 10:25:38 -04:00
Valera Rozuvan
4b5f77aa55 Added back old method of getting caption position for Flash video playback. 
Because with speed changing the time also changes for Flash playback,
a different way to calculate the current time is needed than for HTML5
playback. I have added conditions for Flash and HTML5 video, and put
old method of calculating time for Flash.

I have tested it on the YouTube video ZwkTiUPN0mg. Both HTML5 mode and
Flash mode have proper video-captions syncing with this fix. NOTE: to view
YouTube video in Flash mode you either have to use an old browser (ex. Firefox
version 18) or hard code in source that state.currentPlayerMode = 'flash' (in
function _setPlayerMode(), file 01_initialize.js).
 2013-08-16 09:42:14 -04:00
Peter Fogg
a66743128a Correctly seek in captions with non-1.0 speeds. 2013-08-16 09:42:04 -04:00
polesye
a2dcf9aa9c Merge pull request #689 from edx/anton/fix_video_speed_button 
Video: disable speed controls for unsupported browsers.
 2013-08-16 05:58:37 -07:00
Anton Stupak
9b76b49292 Disable speed controls for unsupported browsers. 2013-08-16 14:44:44 +03:00
Peter Fogg
346fb7b4fa Merge pull request #698 from edx/peter-fogg/grading-cutoffs-fix 
Fix grade range names not being editable.
 2013-08-15 20:06:54 -07:00
Carlos Andrés Rocha
bbfe3662e2 Enable the django_nose app by default 
The django_nose it is very useful, even outside the test
environment. For example, it lets you to easily run test from
manage.py without additional changes to the test packages.
 2013-08-15 19:31:30 -04:00
jkarni
a260115b01 Merge pull request #685 from edx/jkarni/fix/cms_pylint 
Contentstore views pylint fixes
 2013-08-15 16:05:09 -07:00
Jonah Stanley
796667cbdb Merge pull request #701 from edx/jonahstanley/fix-lms-acceptance-issue 
Workaround for issue
 2013-08-15 14:01:35 -07:00
JonahStanley
a067fb58d6 Workaround for issue 
Better wording of commit

Workaround for issue

Better wording of commit

Fixed spacing
 2013-08-15 16:59:30 -04:00
David Ormsbee
5f8eab5f95 Merge pull request #687 from edx/bugfix/ichuang/optioninput-msg 
capa optioninput template was missing msg output (needed for hints)
 2013-08-15 13:52:50 -07:00
Peter Fogg
a93d7229ac Fix grade range names not being editable. 2013-08-15 16:30:14 -04:00
Chris Dodge
71de34fca3 use same getattr pattern in the XModule constructor that exists in the XModuleDescriptor 2013-08-15 16:24:54 -04:00
Don Mitchell
03608a8931 have XModuleDescriptor properly ensure category is set 2013-08-15 16:21:31 -04:00
Carlos Andrés Rocha
0acc201a21 Add test for invalid YouTube IDs strings 2013-08-15 16:19:22 -04:00
cahrens
96b4914fef Make our deserializing consistent with serializing. 
Also fixes problems with double-quoted strings (historical artifact).

STUD-640

Conflicts:

	common/lib/xmodule/xmodule/video_module.py
 2013-08-15 16:17:29 -04:00
Chris Dodge
f27ed07305 update tests to call definition_to_xml rather than export_to_xml, which presumes writing to a filesystem, plus it adds a url_name to the attribute set. Also, on __init__ reset the 'category' attribute, on some code paths this can get lost. Not sure why, but this gets all the tests to pass. 2013-08-15 16:10:57 -04:00
Chris Dodge
43f2c6a8e4 remove commented out line 2013-08-15 16:10:44 -04:00
Chris Dodge
26651a1dd7 export_to_xml() really should be definition_to_xml() since we'll rely on the base method that is in xml_module.py to preserve the correct export filesystem hierarchy. 2013-08-15 16:10:30 -04:00
Chris Dodge
958597ac71 was getting unicode errors when exporting CB22x 2013-08-15 16:10:02 -04:00
Christina Roberts
03b6050348 Merge pull request #667 from edx/christina/read-only-api 
Make split mongo read-only API consistent with other modulestores.
 2013-08-15 13:05:58 -07:00
Carlos Andrés Rocha
f4fe6de38f Merge pull request #684 from rocha/test-invalid-youtube-ids 
Add test for invalid YouTube IDs strings
 2013-08-15 10:13:26 -07:00
cahrens
9f229a4605 Make get_errored_courses part of the modulestore API (with default implementation). 
Also clarifies the contraction of location.course_id by throwing an exception for lcoations that are not of category course.

Add test for course_id method.
 2013-08-15 12:50:37 -04:00
Vik Paruchuri
c9e0d36d16 Merge pull request #621 from edx/fix/vik/oe-issues 
Fix/vik/oe issues
 2013-08-15 08:27:34 -07:00
Carlos Andrés Rocha
9199f1d08b Add test for invalid YouTube IDs strings 2013-08-15 11:06:53 -04:00
Jay Zoldak
bbb5059d36 Merge branch 'release' 2013-08-15 10:59:09 -04:00
Jay Zoldak
0350dea2eb Merge pull request #682 from edx/sarina/hotfix/fix-combinedopenended 
Fix error seen in combinedopenended modules
 2013-08-15 07:48:55 -07:00
Peter Baratta
55b67e39bb Merge pull request #680 from edx/peterb/move-numpy-seterr 
Move the silencing of numpy's warnings into test_calc.py
 2013-08-15 07:31:03 -07:00
Julian Arni
80619da429 Review fixes 2013-08-15 10:24:38 -04:00
Peter Baratta
5f3dd37f98 Move the silencing of numpy's warnings into test_calc.py 
..because that is where it is the most annoying/visible. Otherwise it really
has no effect on the LMS or anything else.
 2013-08-15 08:54:43 -04:00
chrisndodge
0db4c98782 Merge pull request #658 from edx/bugfix/ichuang/delete_course_group_not_exist 
catch error in delete_course management script when group does not exist
 2013-08-15 04:57:43 -07:00
Valera Rozuvan
8ba9497fd9 Merge pull request #675 from edx/anton/disable_0-25x_speed 
Add filter for playback rates.
 2013-08-14 19:46:58 -07:00
ichuang
501c089f41 capa optioninput template was missing msg output (needed for hints) 2013-08-14 21:51:40 -04:00
Julian Arni
3ed4198204 Contentstore views pylint fixes 2013-08-14 19:10:00 -04:00
Adam Palay
c5d52b8b74 turn off i18n 2013-08-14 17:14:05 -04:00
Adam
bcb4ae0751 Merge pull request #683 from edx/adam/turn-off-i18n 
turn off i18n
 2013-08-14 14:10:26 -07:00
Adam Palay
4855fd5af4 turn off i18n 2013-08-14 17:03:21 -04:00
Sarina Canelake
6a1e88cf77 Merge pull request #681 from edx/sarina/hotfix/fix-combinedopenended 
Fix error seen in combinedopenended modules
 2013-08-14 13:53:52 -07:00
Sarina Canelake
f438922a88 Fix error seen in combinedopenended modules 2013-08-14 16:36:33 -04:00
Jay Zoldak
c65c9eb069 Merge pull request #657 from edx/zoldak/fix-i18n-enroll 
The enrollment_action value enroll should not be translated.
 2013-08-14 13:18:00 -07:00
Diana Huang
cc86fb3f23 Merge pull request #676 from edx/diana/course-modes 
Add Course Modes to LMS
 2013-08-14 12:33:55 -07:00
Diana Huang
7d44379c99 Add admin site for CourseMode 2013-08-14 15:13:11 -04:00