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

35 Commits

Author SHA1 Message Date
Calen Pennington
b0bed170de Enable (and test) xml export of pure XBlocks 
[LMS-179]
[LMS-209]
[LMS-1345]
 2014-02-05 13:02:40 -05:00
Calen Pennington
46109bb3e8 Use XBlock xml serialization and deserialization 
XModules continue to use their own interface for xml, but provide an
adaptor that makes the the XBlock interface available.

[LMS-179]
 2014-01-14 13:28:47 -05:00
Calen Pennington
b4a1840344 Move xmodule_runtime.xmodule_instance registration earlier 
This allows XModules (specifically CombinedOpenEnded) to use ajax_url
during their init functions (which would, before, have thrown an
exception).

[LMS-1493]
 2013-11-20 10:15:09 -05:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
Don Mitchell
3722685e1a No longer persist XModule templates 
Instead, we use XModule field default values when creating an empty
XModule. Driven by this use case, we also allow for XModules to be
created in memory without being persisted to the database at all. This
necessitates a change to the Modulestore api, replacing clone_item with
create_draft and save_xmodule.
 2013-07-16 14:33:58 -04:00
Carlos Andrés Rocha
eedeaf286b Revert "Fixed abtests to use the preferences scope correctly." 
This reverts commit 74d20c2028.
 2013-07-01 13:23:24 -04:00
Felix Sun
74d20c2028 Fixed abtests to use the preferences scope correctly. 
Made abtests display its children in the right order.
 2013-07-01 13:16:55 -04:00
cahrens
89d0003603 Be strict about ModelType expected types, rename Object as Dict. 2013-06-12 14:59:17 -04:00
Chris Dodge
8ece663284 more drive by violation fixes 2013-04-12 15:45:27 -04:00
Calen Pennington
039ccb83cc Migrate to the open source XBlock repo 2013-04-04 10:55:31 -04:00
Calen Pennington
92e99d7a8b Move field definitions for XModules into mixin classes, so that descriptors and modules always have the same set of fields 2013-03-13 11:35:50 -04:00
Calen Pennington
4f555f6480 Merge remote-tracking branch 'origin/master' into feature/cale/xmodule-storage-model 
Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/module_info_model.py
	cms/djangoapps/contentstore/tests/factories.py
	cms/djangoapps/contentstore/tests/test_course_settings.py
	cms/djangoapps/contentstore/views.py
	cms/djangoapps/models/settings/course_details.py
	cms/djangoapps/models/settings/course_grading.py
	cms/templates/edit_subsection.html
	common/djangoapps/mitxmako/shortcuts.py
	common/djangoapps/static_replace.py
	common/djangoapps/util/converters.py
	common/djangoapps/xmodule_modifiers.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/abtest_module.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/discussion_module.py
	common/lib/xmodule/xmodule/error_module.py
	common/lib/xmodule/xmodule/html_module.py
	common/lib/xmodule/xmodule/js/src/video/display.coffee
	common/lib/xmodule/xmodule/mako_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/store_utilities.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	common/lib/xmodule/xmodule/raw_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_export.py
	common/lib/xmodule/xmodule/tests/test_import.py
	common/lib/xmodule/xmodule/video_module.py
	common/lib/xmodule/xmodule/x_module.py
	common/lib/xmodule/xmodule/xml_module.py
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/django_comment_client/utils.py
	lms/templates/staff_problem_info.html
	lms/templates/video.html
	rakefile
 2013-02-07 15:12:30 -05:00
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
Calen Pennington
89a0b82e5c Decrease the number of queries needed for LMS courseware 
This cuts the number of queries in 6.002 courseware loads from ~650 to
~5-40. Still to do: cache CustomTag templates so that we only load them
once per request.
 2013-01-10 13:55:46 -05:00
Calen Pennington
789ac3fc87 Use the XBlock library as the base for XModule, so that we can incrementally rely on more and more of the XBlock api 2013-01-04 16:19:58 -05:00
Calen Pennington
e4c06fab4a Cleaning up ABTest properties 2012-12-28 14:55:32 -05:00
Calen Pennington
db55001bf6 Use named scope for student_preferences in abtests 2012-12-28 14:55:32 -05:00
Calen Pennington
6e933ae756 Fix typo 2012-12-28 14:55:32 -05:00
Calen Pennington
8693d288c8 Fix errors from running unit tests (some tests still fail) 2012-12-28 14:51:50 -05:00
Calen Pennington
d11a9b1d21 Convert ABTest module to new property based format. Doesn't account for definition_to_xml needing redefinition 2012-12-28 14:51:50 -05:00
Calen Pennington
8ba4163557 WIP. Data loads, but not all of it 2012-12-28 14:39:13 -05:00
Calen Pennington
bacd728efc Squelch some (but not all, yet) errors during template loading 2012-10-24 16:25:20 -04:00
Calen Pennington
d4377d4ada Make imports into the CMS ignore broken modules, while still loading bad xml as error modules in the LMS 2012-09-25 10:10:44 -04:00
Calen Pennington
7d8095cd97 Initial port of templates into filesystem based storage 2012-09-25 10:10:44 -04:00
Bridger Maxwell
a43b09c0a9 Fixed new implementation of abtest's displayable_items. 2012-09-20 13:23:47 -04:00
Bridger Maxwell
28826b8a36 Added new API to xmodule(descriptor). get_children_locations and has_dynamic_children. 2012-09-20 00:31:37 -04:00
Victor Shnayder
9a14af4ba1 address comment on #412 2012-08-15 10:27:07 -04:00
Victor Shnayder
b782e2ff5d Make start dates work for all modules 
* error modules now hidden via access control
* get_module() returns None if user doesn't have access
 2012-08-14 23:30:37 -04:00
Victor Shnayder
1d8dcf30f9 docstring cleanups 2012-08-10 11:42:53 -04:00
Bridger Maxwell
735488fa51 Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading 2012-08-07 14:40:37 -04:00
Bridger Maxwell
f872e41d1d Added descriptor to xmodule init. Now xmodules have pointer to their descriptor. 2012-08-07 13:43:30 -04:00
Victor Shnayder
6ed9052755 minor cleanups 2012-08-07 11:06:46 -04:00
Calen Pennington
8119e6b939 Adding comment about future of user groups 2012-07-11 22:19:34 -04:00
Calen Pennington
aeae2e02e2 Add docstrings to abtest with xml and json formats 2012-07-11 22:18:40 -04:00
Calen Pennington
a0f550396c Make xmodule fit the typical python installation setup 2012-07-02 13:19:27 -04:00