Chris Dodge
13ff461461
add a filter to get_courses to not surface any courses that haven't been mapped, unless the store provider has been labeled as 'default'
2013-08-16 10:30:47 -04:00
Chris Dodge
ae6f97a368
add test for test_static_url_generation_from_courseid
2013-08-16 09:51:57 -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
Anton Stupak
9b76b49292
Disable speed controls for unsupported browsers.
2013-08-16 14:44:44 +03:00
Chris Dodge
bca2018ab5
add unit tests for all methods in MixedModuleStore
2013-08-16 00:53:15 -04:00
Chris Dodge
cf715cb727
fix pylint violations
2013-08-15 22:58:04 -04:00
Chris Dodge
ed584a9abb
fix pep8 violations
2013-08-15 22:58:04 -04:00
Chris Dodge
c6cde6a722
resolve incorrect merge conflict resolution
2013-08-15 22:58:04 -04:00
Chris Dodge
61219169d4
change over the modulestore configuration to be a dict and use a property accessor. Also update some django-admin configs to use this means to set the runtime configuration
2013-08-15 22:58:04 -04:00
Chris Dodge
0b8866ef29
forgot to return dictionary on get_errored_courses
2013-08-15 22:58:04 -04:00
Chris Dodge
9cc796df83
fix one more 'revision' -> 'branch' argument name change
2013-08-15 22:58:03 -04:00
Chris Dodge
7a80a9c02a
fix broken test after rebase
2013-08-15 22:58:03 -04:00
Chris Dodge
7bdc4c5134
fix errant conflict resolution
2013-08-15 22:58:03 -04:00
Chris Dodge
52928d165a
update SplitModuleStore tests to pull the course_id from the locator
2013-08-15 22:58:03 -04:00
Chris Dodge
9f14f1ee62
update file comment on MixedModuleStore
2013-08-15 22:58:03 -04:00
Chris Dodge
54bd3170bc
remove another debug logging message
2013-08-15 22:58:03 -04:00
Chris Dodge
fa61bdf69f
remove debugging logging
2013-08-15 22:58:02 -04:00
Chris Dodge
5298f54f4c
fix tests
2013-08-15 22:58:02 -04:00
Chris Dodge
cff93d324b
WIP
2013-08-15 22:58:02 -04:00
Chris Dodge
2616d8f7a2
remove unneeded type check on the modulestore
2013-08-15 22:58:02 -04:00
Chris Dodge
82988972ad
WIP: added a get_modulestore_type. Added some unit tests. changed over the isinstance() with respect to modulestores to use this get_modulestore_type()
2013-08-15 22:58:02 -04:00
Chris Dodge
b5253b52b6
add a set_modulestore_configuration to the modulestore interface. This can be used to pass in settings run the Django tier
2013-08-15 22:56:32 -04:00
Chris Dodge
6f11b98b4f
initial commit for a mixed module store which can interoperate with both XML and Mongo module stores
2013-08-15 22:56:32 -04:00
Vik Paruchuri
7b9dde78fe
Fetch the correct rubric
2013-08-15 19:21:28 -04:00
Vik Paruchuri
8218a4a220
Show the right rubric, be more explicit about "next step"
2013-08-15 19:09:09 -04:00
Vik Paruchuri
b97dbc37a6
Fix test, strip out more of show results
2013-08-15 18:57:32 -04:00
Vik Paruchuri
a49da5d530
Fix rubrics, strip out get results
2013-08-15 18:55:42 -04:00
Jason Bau
fa3bd7a19a
small change in aggregating peer eval grades (rounds up)
2013-08-15 15:00:38 -07:00
Vik Paruchuri
b6a5808548
Show submit button correctly for self assessment
2013-08-15 17:50:36 -04:00
Vik Paruchuri
35a540a0f6
Fix bug with leaving open ended response page and coming back
2013-08-15 17:25:04 -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
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
Vik Paruchuri
f8b5e67363
Text and styling cleanup
2013-08-15 14:52:51 -04:00
Vik Paruchuri
ac4d312415
Make rubric text generic, fix right arrow
2013-08-15 14:26:42 -04:00
Vik Paruchuri
b817f4caad
Merge remote-tracking branch 'origin/feature/vik/oe-ui' into feature/vik/oe-ui
2013-08-15 14:15:50 -04:00
Vik Paruchuri
f8dab92ba6
Hide submit button after student submits
2013-08-15 14:15:19 -04:00
marco
72bb93d436
Merge branch 'feature/vik/oe-ui' of github.com:edx/edx-platform into feature/vik/oe-ui
2013-08-15 13:57:05 -04:00
marco
7865fbe0df
cleaned up padding for peer review training and grading states, removed extraneous response label,fixed style issue on rubric for peer grading where rubric items had a background color overridding the intended style
2013-08-15 13:56:17 -04: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
9211a38374
Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui
...
Conflicts:
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
2013-08-15 11:36:11 -04:00
