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
|
01411ae66e
|
WIP: Trying to get tests working
|
2012-12-28 14:48:47 -05:00 |
|
Arjun Singh
|
7ad9b39b98
|
Merge master
|
2012-09-10 15:33:59 -07:00 |
|
Arjun Singh
|
242f523d74
|
Explicit request timeout
|
2012-09-05 15:09:15 -07:00 |
|
Victor Shnayder
|
f5754f6d1e
|
Add some rudimentary error checking to forum views
[Hopefully fix #34992235]
|
2012-08-29 13:30:55 -04:00 |
|
David Ormsbee
|
aeee2791ea
|
Merge remote-tracking branch 'rocky/master' into feature/dave/forum_fixes
Conflicts:
lms/lib/comment_client/utils.py
lms/templates/discussion/mustache/_content.mustache
|
2012-08-22 20:00:06 -04:00 |
|
David Ormsbee
|
2e39131b31
|
Tiny fix to handle when data_or_params isn't passed in
|
2012-08-22 19:16:28 -04:00 |
|
Rocky Duan
|
4b97e70a4c
|
fixed bug when no data is transmitted otherwise
|
2012-08-21 17:10:29 -07:00 |
|
Rocky Duan
|
e3a3f7094a
|
added shared key authentication
|
2012-08-21 15:45:41 -07:00 |
|
Rocky Duan
|
e49226e9e1
|
some refactor
|
2012-08-19 00:16:04 -07:00 |
|
Rocky Duan
|
38bdcabe53
|
reply now works again
|
2012-08-13 23:23:13 -07:00 |
|
Rocky Duan
|
d6f3492975
|
replaced comment client sym link
|
2012-08-12 22:55:55 -07:00 |
|