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
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
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
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
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
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
Anton Stupak
b4df2c4d73
Add filter for playback rates.
2013-08-14 18:15:18 +03:00
cahrens
13ef870b1b
pylint/pep8 cleanup.
...
cleanup.
2013-08-14 09:59:44 -04:00
cahrens
aed29cb01f
Add get_instance method.
2013-08-14 09:50:00 -04:00
cahrens
70d5ec6ea4
Make it clear that get_course_for_item is only a helper method in mongo modulestore.
2013-08-14 09:04:58 -04:00
Valera Rozuvan
b583a4e793
Optimizing code. Caching an element selector.
2013-08-14 11:56:13 +03:00
Valera Rozuvan
99ae63777e
Removed unnecessary tabindex = 0 from <a /> - they get it by default.
2013-08-14 11:51:15 +03:00
Valera Rozuvan
3b326c3072
Fixing spelling typos in comments.
2013-08-14 11:49:27 +03:00
Valera Rozuvan
efac70e6b3
Adding documentation to the event handlers for volume and speed control.
2013-08-14 10:51:45 +03:00
Valera Rozuvan
da3e21ceee
Fixed tabbing backwards.
...
Now you can tab through all of the controls in Video forwards, and then tab backwards.
2013-08-14 10:51:45 +03:00
Valera Rozuvan
0a5d261fc4
For YouTube videos tabbing from Speeds to Volume closes Speeds dialog.
...
An old TODO item was done. It turns out a simple case of calling
the method to bind handlers after the Spees dialog was re-rendered.
2013-08-14 10:51:45 +03:00
marco
3a970d1490
restyled controls area for motion through multiple scored peer reviews
2013-08-13 20:56:53 -04:00
Carlos Andrés Rocha
a2225aad01
Merge pull request #655 from rocha/cleanup-xmodule-test-imports
...
Cleanup some xmodule tests imports and data directory location
2013-08-13 14:48:26 -07:00
cahrens
e0aa46ab2d
Make split mongo read-only API consistent with other modulestores.
2013-08-13 15:06:08 -04:00
marco
ab81000665
visual styling changes to staff grading and peer grading, along with additional instances of the use of the baseline variable instead of pixel definitions for padding and margins.
2013-08-13 14:42:34 -04:00
