bc8244b709
Rename reset to try again, hide and disable submit buttons
Vik Paruchuri
2013-08-16 14:43:37 -04:00
6bc8d3273d
Merge pull request #716 from edx/jtauber/fix-encoding
James Tauber
2013-08-16 11:38:54 -07:00
4e0f3d0791
Merge pull request #706 from rocha/enable-django-nose-for-all
Carlos Andrés Rocha
2013-08-16 11:29:43 -07:00
e91205aff3
Merge branch 'release'
Jay Zoldak
2013-08-16 14:25:03 -04:00
9c67e56d00
Merge pull request #714 from edx/zoldak/hotfix-2013-08-16
Jay Zoldak
2013-08-16 11:15:34 -07:00
4f3ec68fb7
Scroll to top in peer and staff grading, preserve line breaks in submissions
Vik Paruchuri
2013-08-16 14:12:37 -04:00
4c28684014
pass xblock fields as top-level keywords on factories
Don Mitchell
2013-08-16 14:01:16 -04:00
b985722255
fixed encoding
James Tauber
2013-08-16 13:52:07 -04:00
be3291eeb0
Proper scoping, show status to staff, fix line break issues, multiple self assessments on one page work
Vik Paruchuri
2013-08-16 13:22:34 -04:00
f3e282e3ed
Merge pull request #712 from edx/jtauber/fix-typo
James Tauber
2013-08-16 10:18:55 -07:00
d1ce55f65c
have the test teardown explicitly call destroy_db
Chris Dodge
2013-08-16 12:02:58 -04:00
97083d0f69
fixed typo in faculty member settings
James Tauber
2013-08-16 11:49:20 -04:00
d4ea8388a6
updated styling for marketing side register button to accommodate second line of text - and IE-specific styling
Frances Botsford
2013-08-16 11:28:07 -04:00
0a59cb6598
in grading, if problem cannot be created, return score as none
Adam Palay
2013-08-15 10:35:29 -04:00
01c743f244
Merge pull request #664 from edx/peterb/fix/math-initial-display
Peter Baratta
2013-08-16 08:17:03 -07:00
43bee86074
Tightened up wording
JonahStanley
2013-08-16 11:08:05 -04:00
967fdee6bc
Made filling field a bit safer
JonahStanley
2013-08-16 10:55:14 -04:00
69a0683322
Remove obsolete attrs.
Don Mitchell
2013-08-16 09:55:58 -04:00
5029659327
Better explain behavior and todo's
Don Mitchell
2013-08-12 17:26:34 -04:00
438bbffb93
Add field iterator which includes namespaced fields
Don Mitchell
2013-08-12 17:25:35 -04:00
929597ce84
Move load_from_json to the test file only
Don Mitchell
2013-08-12 17:22:05 -04:00
857431f793
Clarify comments re behavior
Don Mitchell
2013-08-12 14:22:35 -04:00
a507ebc1b6
Clarify function name
Don Mitchell
2013-08-09 16:39:31 -04:00
e4a69373d0
xblock fields persist w/o breaking by scope
Don Mitchell
2013-08-08 17:44:48 -04:00
321fc36e45
Merge pull request #691 from edx/fix/adam/progress-page
Adam
2013-08-16 07:40:51 -07:00
445cf39f8b
updated styling for marketing side register button to accommodate second line of text
Frances Botsford
2013-08-16 09:18:23 -04:00
fc67c2ee6b
Wrote preliminary help modal acceptance tests
JonahStanley
2013-08-16 10:36:12 -04:00
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'
Chris Dodge
2013-08-16 10:30:47 -04:00
8aee225136
in grading, if problem cannot be created, return score as none
Adam Palay
2013-08-15 10:35:29 -04:00
ae6f97a368
add test for test_static_url_generation_from_courseid
Chris Dodge
2013-08-16 09:51:57 -04:00
4b5f77aa55
Added back old method of getting caption position for Flash video playback.
Valera Rozuvan
2013-08-16 14:06:42 +03:00
a66743128a
Correctly seek in captions with non-1.0 speeds.
Peter Fogg
2013-08-15 17:24:03 -04:00
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
Chris Dodge
2013-08-13 19:56:00 -04:00
0b8866ef29
forgot to return dictionary on get_errored_courses
Chris Dodge
2013-08-13 17:01:09 -04:00
5ee5beafbe
fix bad merge conflict resolution
Chris Dodge
2013-08-13 12:42:24 -04:00
9cc796df83
fix one more 'revision' -> 'branch' argument name change
Chris Dodge
2013-08-08 15:52:11 -04:00
7a80a9c02a
fix broken test after rebase
Chris Dodge
2013-08-08 15:40:28 -04:00
7bdc4c5134
fix errant conflict resolution
Chris Dodge
2013-08-05 13:40:26 -04:00
52928d165a
update SplitModuleStore tests to pull the course_id from the locator
Chris Dodge
2013-07-29 21:30:07 -04:00
e4eea6cc4f
some additional comments to clarify the partially bogus course_id.
Chris Dodge
2013-07-29 21:15:39 -04:00
aa8b054590
fix missed conflict resolution
Chris Dodge
2013-07-25 13:38:18 -04:00
9f14f1ee62
update file comment on MixedModuleStore
Chris Dodge
2013-07-25 11:28:40 -04:00
54bd3170bc
remove another debug logging message
Chris Dodge
2013-07-25 11:27:44 -04:00
fa61bdf69f
remove debugging logging
Chris Dodge
2013-07-25 11:25:38 -04:00
5298f54f4c
fix tests
Chris Dodge
2013-07-25 10:56:57 -04:00
cff93d324b
WIP
Chris Dodge
2013-07-25 00:50:42 -04:00
2616d8f7a2
remove unneeded type check on the modulestore
Chris Dodge
2013-07-24 08:52:11 -04:00
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()
Chris Dodge
2013-07-24 08:40:04 -04:00
b5253b52b6
add a set_modulestore_configuration to the modulestore interface. This can be used to pass in settings run the Django tier
Chris Dodge
2013-07-23 21:25:18 -04:00
6f11b98b4f
initial commit for a mixed module store which can interoperate with both XML and Mongo module stores
Chris Dodge
2013-07-22 10:26:12 -04:00
bbfe3662e2
Enable the django_nose app by default
Carlos Andrés Rocha
2013-08-15 19:31:30 -04:00
7b9dde78fe
Fetch the correct rubric
Vik Paruchuri
2013-08-15 19:21:28 -04:00
8218a4a220
Show the right rubric, be more explicit about "next step"
Vik Paruchuri
2013-08-15 19:09:09 -04:00
b97dbc37a6
Fix test, strip out more of show results
Vik Paruchuri
2013-08-15 18:57:32 -04:00
a49da5d530
Fix rubrics, strip out get results
Vik Paruchuri
2013-08-15 18:55:42 -04:00
fa3bd7a19a
small change in aggregating peer eval grades (rounds up)
Jason Bau
2013-08-15 12:27:44 -07:00
b6a5808548
Show submit button correctly for self assessment
Vik Paruchuri
2013-08-15 17:50:36 -04:00
35a540a0f6
Fix bug with leaving open ended response page and coming back
Vik Paruchuri
2013-08-15 17:25:04 -04:00
796667cbdb
Merge pull request #701 from edx/jonahstanley/fix-lms-acceptance-issue
Jonah Stanley
2013-08-15 14:01:35 -07:00
a067fb58d6
Workaround for issue
JonahStanley
2013-08-15 16:47:23 -04:00
5f8eab5f95
Merge pull request #687 from edx/bugfix/ichuang/optioninput-msg
David Ormsbee
2013-08-15 13:52:50 -07:00
c8fdf6ad29
Add in tests for the marketing site button.
Diana Huang
2013-08-15 13:12:05 -04:00
6db1f6a6c0
Add new column to CourseMode table for currencies
Diana Huang
2013-08-14 19:40:02 -04:00
4946fbcd5b
Change registration button based on number of modes.
Diana Huang
2013-08-14 17:46:33 -04:00
a93d7229ac
Fix grade range names not being editable.
Peter Fogg
2013-08-15 16:20:25 -04:00
71de34fca3
use same getattr pattern in the XModule constructor that exists in the XModuleDescriptor
Chris Dodge
2013-08-15 16:24:54 -04:00
03608a8931
have XModuleDescriptor properly ensure category is set
Don Mitchell
2013-08-15 11:04:48 -04:00
0acc201a21
Add test for invalid YouTube IDs strings
Carlos Andrés Rocha
2013-08-14 17:37:10 -04:00
96b4914fef
Make our deserializing consistent with serializing.
cahrens
2013-08-15 11:03:31 -04:00
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.
Chris Dodge
2013-08-15 01:04:55 -04:00
43f2c6a8e4
remove commented out line
Chris Dodge
2013-08-15 00:28:16 -04:00
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.
Chris Dodge
2013-08-14 23:35:40 -04:00
958597ac71
was getting unicode errors when exporting CB22x
Chris Dodge
2013-08-14 23:09:06 -04:00
03b6050348
Merge pull request #667 from edx/christina/read-only-api
Christina Roberts
2013-08-15 13:05:58 -07:00
f8b5e67363
Text and styling cleanup
Vik Paruchuri
2013-08-15 14:52:51 -04:00
a084d4486d
Get rid of labels
Vik Paruchuri
2013-08-15 14:28:52 -04:00
ac4d312415
Make rubric text generic, fix right arrow
Vik Paruchuri
2013-08-15 14:26:42 -04:00
59c2bb18ef
Bare bones outline of ID verification templates
David Ormsbee
2013-08-15 14:20:36 -04:00
72bb93d436
Merge branch 'feature/vik/oe-ui' of github.com:edx/edx-platform into feature/vik/oe-ui
marco
2013-08-15 13:57:05 -04:00
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
marco
2013-08-15 13:56:17 -04:00
a29243fc7c
Add logging to save item
Julian Arni
2013-08-15 13:49:26 -04:00
d84f764840
Basic first commit of Photo ID Verification model and test code
David Ormsbee
2013-08-09 12:14:29 -04:00
f4fe6de38f
Merge pull request #684 from rocha/test-invalid-youtube-ids
Carlos Andrés Rocha
2013-08-15 10:13:26 -07:00
9f229a4605
Make get_errored_courses part of the modulestore API (with default implementation).
cahrens
2013-08-15 12:42:13 -04:00
Vik Paruchuri