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 |
|
Diana Huang
|
65c56edb5c
|
Better error logging when login into queue fails
|
2012-12-03 15:04:34 -05:00 |
|
Vik Paruchuri
|
bf361af3b3
|
Added debug code, then removed it
|
2012-11-29 16:11:49 -05:00 |
|
Victor Shnayder
|
ef1dda67b3
|
formatting in xqueue_interface.py
|
2012-10-08 10:58:38 -04:00 |
|
kimth
|
fb5501855c
|
Merge master
|
2012-08-28 12:37:24 -04:00 |
|
kimth
|
98542f79ec
|
Define dateformat variable in xqueue_interface
|
2012-08-27 19:14:47 -04:00 |
|
kimth
|
1dcaf21f81
|
Send idhash
|
2012-08-25 07:57:17 -04:00 |
|
kimth
|
891797a3bb
|
Submission of files through requests.POST depletes the file pointer. Need to rewind for replay
|
2012-08-19 20:38:10 -04:00 |
|
kimth
|
9b94bb17e4
|
Default param is None rather than []
|
2012-08-19 12:19:10 -04:00 |
|
kimth
|
f5e60412ee
|
Send multiple files to xqueue
|
2012-08-19 11:02:03 -04:00 |
|
kimth
|
b2599f075f
|
Send multiple files to xqueue
|
2012-08-19 11:00:51 -04:00 |
|
kimth
|
d2cb645834
|
Multiple file submissions
|
2012-08-19 09:26:03 -04:00 |
|
Calen Pennington
|
9c0e41691c
|
Make XQueueInterface a new-style class
|
2012-08-14 15:57:07 -04:00 |
|
Calen Pennington
|
8ce12b10b2
|
Pass HttpBasicAuth object to requests, rather than a list, which it didn't understand
|
2012-08-14 12:32:52 -04:00 |
|
Calen Pennington
|
c4bed2c128
|
Add basic authentication support for requests made to the xqueue server
|
2012-08-14 11:59:47 -04:00 |
|
Calen Pennington
|
f09aca917f
|
Fix name of XQueueInterface
|
2012-08-14 11:59:46 -04:00 |
|
Calen Pennington
|
91b6bb649c
|
Move queue interface url and auth into configuration, rather than hardcoding it
|
2012-08-14 11:59:46 -04:00 |
|
kimth
|
d3f4746f57
|
Don't contact queueing server on Django load
|
2012-08-06 19:02:40 -04:00 |
|
kimth
|
18a7f58735
|
Handle xreply parsing errors more gracefully
|
2012-08-06 17:44:07 -04:00 |
|
kimth
|
b6e9e7a4bb
|
Handle network errors more gracefully
|
2012-08-06 17:36:38 -04:00 |
|
kimth
|
41e7d72ea8
|
Xqueue interface is embedded in ModuleSystem
|
2012-08-06 16:13:35 -04:00 |
|
kimth
|
110637c023
|
XqueueInterface is a singleton instantiated object
|
2012-08-06 15:06:19 -04:00 |
|
kimth
|
881cafb88d
|
Moved default parameter assignment to function def, parse_xreply util function
|
2012-08-06 09:14:09 -04:00 |
|
kimth
|
8eff9f7caa
|
Upload to xqueue
|
2012-08-03 17:11:55 -04:00 |
|
kimth
|
c25eded4fc
|
Move xqueue_interface to lib/capa
|
2012-08-03 15:32:02 -04:00 |
|