Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

19654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
jkarni
a260115b01 Merge pull request #685 from edx/jkarni/fix/cms_pylint 
Contentstore views pylint fixes
 2013-08-15 16:05:09 -07: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
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
Diana Huang
c8fdf6ad29 Add in tests for the marketing site button. 2013-08-15 16:34:48 -04:00
Diana Huang
6db1f6a6c0 Add new column to CourseMode table for currencies 2013-08-15 16:34:48 -04:00
Diana Huang
4946fbcd5b Change registration button based on number of modes. 2013-08-15 16:34:48 -04: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
Vik Paruchuri
f8b5e67363 Text and styling cleanup 2013-08-15 14:52:51 -04:00
Vik Paruchuri
a084d4486d Get rid of labels 2013-08-15 14:28:52 -04:00
Vik Paruchuri
ac4d312415 Make rubric text generic, fix right arrow 2013-08-15 14:26:42 -04:00
David Ormsbee
59c2bb18ef Bare bones outline of ID verification templates 2013-08-15 14:20:36 -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
Julian Arni
a29243fc7c Add logging to save item 2013-08-15 13:49:26 -04:00
David Ormsbee
d84f764840 Basic first commit of Photo ID Verification model and test code 2013-08-15 13:18:04 -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
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
Vik Paruchuri
6f657c1124 Import to fix internationalization 2013-08-15 10:30:16 -04: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