Calen Pennington
|
a9c5a6388c
|
Update to version of xblock that supports full inheritance of field attributes
|
2013-03-13 14:51:10 -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 |
|
Victor Shnayder
|
e0fb906c06
|
add note about potential bug in verticals. No time to investigate at the moment...
|
2013-01-31 12:14:20 -05:00 |
|
Calen Pennington
|
cbfc7b201a
|
WIP more changes to model definitions. Next Up: actually wiring model data into the rdbms
|
2012-12-28 14:44:31 -05:00 |
|
Chris Dodge
|
c3aa86f1fb
|
remove template_dir_name from Vertical and Sequence descriptors so that it uses the default template dir
|
2012-10-04 14:53:43 -04:00 |
|
Chris Dodge
|
45b82f3a45
|
update creating a new unit to use an empty template. Also twiddle the units.html and base.js where we put the unit Location on the <li> element
|
2012-10-04 10:58:48 -04:00 |
|
Calen Pennington
|
b305c0bae2
|
Make drag/drop save content immediately in seqs and verticals
|
2012-10-01 15:17:41 -04:00 |
|
Calen Pennington
|
b91c2b6680
|
Add sequence and vertical js modules that add drag and drop
|
2012-10-01 15:17:41 -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 |
|
Calen Pennington
|
9458e53988
|
Adding stripped down 6002x course for testing, along with CMS test for edit pages for same
|
2012-07-24 16:13:51 -04:00 |
|
Calen Pennington
|
a0f550396c
|
Make xmodule fit the typical python installation setup
|
2012-07-02 13:19:27 -04:00 |
|