Calen Pennington
8201b1412e
Use XBlock 0.3
2013-09-06 09:45:59 -04:00
Brian Wilson
a67674fe34
set task_id on LMS side.
2013-06-18 11:17:16 -04:00
Brian Wilson
d2b3977f57
Add dogstat logging to background tasks.
2013-06-18 11:13:55 -04:00
Brian Wilson
c676cfd64a
Rename fields in CourseTaskLog, including a task_key column for indexing. Use 'rescore' instead of 'regrade'. Clean up task submission.
2013-06-18 11:13:19 -04:00
Brian Wilson
7711c00e2c
Pull task_queue.py methods out from tasks.py, to represent API calls
...
from client. Tasks.py remains the task implementations running on the
celery worker.
In particular, move status message generation out of task thread to client side.
2013-06-18 11:04:05 -04:00
Brian Wilson
91ac6e68e8
Define initial celery task on instructor dash.
...
Add CourseTaskLog, and make calls to regrading.
Add regrading implementation, and hack the marshalling of request.
2013-06-18 11:04:05 -04:00
Calen Pennington
039ccb83cc
Migrate to the open source XBlock repo
2013-04-04 10:55:31 -04:00
Calen Pennington
1bfb933518
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
cms/djangoapps/contentstore/tests/test_contentstore.py
cms/djangoapps/contentstore/views.py
cms/templates/edit_subsection.html
cms/templates/overview.html
cms/templates/unit.html
cms/templates/widgets/header.html
common/djangoapps/course_groups/tests/tests.py
common/lib/xmodule/setup.py
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/js/src/.gitignore
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_exporter.py
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
common/lib/xmodule/xmodule/x_module.py
lms/djangoapps/courseware/grades.py
lms/djangoapps/courseware/models.py
lms/djangoapps/courseware/views.py
lms/djangoapps/open_ended_grading/tests.py
2013-03-04 16:33:40 -05:00
David Ormsbee
88a30cb733
Fixes in response to Victor's comments.
2013-03-04 13:21:19 -05:00
David Ormsbee
8f17e6ae9e
First pass at implementing problem history.
2013-02-15 01:30:14 -05:00
Calen Pennington
793bbfd351
Set up dev environment for testing xml vs mongo vs split_mongo modulestores
2013-02-13 14:04:21 -05:00
Brian Wilson
f51876da6a
cosmetic changes
2013-02-08 13:42:54 -05:00
Brian Wilson
290368ef0d
merge out from master
2013-02-07 17:40:54 -05:00
Brian Wilson
80e4944314
minor cleanup
2013-02-07 16:12:02 -05:00
Brian Wilson
cc11dc2aa3
switch to using timelimit module for Pearson test
2013-02-07 15:57:43 -05: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
Brian Wilson
bfc4527590
Switch timed_module to store location, and use to navigate from timer when timer displays on non-exam course pages.
2013-02-06 15:23:11 -05:00
Calen Pennington
cfae1cdf62
Pep8 autofixes
2013-02-06 11:13:50 -05:00
Brian Wilson
1b465d1beb
implement testcenter_login
2013-02-05 18:01:55 -05:00
Brian Wilson
1685f302ab
add TimerModule to courseware
2013-02-04 02:22:24 -05:00
ichuang
19051e40d2
use ajax for doing conditional_module
2013-02-03 18:53:51 -05:00
Calen Pennington
993c24b72b
WIP: Model data caching work
2013-01-23 14:51:07 -05:00
ichuang
04d6f08c0c
add offline grade computation & DB table for this
2013-01-10 23:32:48 -05:00
Calen Pennington
2509308ce9
Remove reference to shared_state_key
2013-01-02 09:05:48 -05:00
Calen Pennington
9c5a922eee
Create tables for all known scopes, and add tests of the LmsKeyValueStore
2012-12-28 14:55:32 -05:00
Calen Pennington
306dbcff9c
Rationalize StudentModule unicode and repr strings
2012-12-28 14:51:50 -05:00
Calen Pennington
c5e3380b71
WIP: Save student state via StudentModule. Inheritance doesn't work
2012-12-28 14:45:46 -05:00
David Ormsbee
53c5170dbc
Simple PEP8 issues.
2012-11-06 18:14:57 -05:00
Victor Shnayder
ec90200b81
fix migration to remove out of date index
...
* reorder index fields
2012-08-21 15:02:26 -04:00
Victor Shnayder
f44d794e63
Add course_id to StudentModule
...
* Update all uses.
2012-08-21 15:01:54 -04:00
kimth
9805b41655
row --> rows
2012-08-15 10:46:33 -04:00
kimth
42ea4f3271
Rename acquire_lock to select_for_update, add docstring
2012-08-15 10:13:35 -04:00
kimth
75eee443ff
Xqueue callback acquires lock on StudentModule to avoid race condition
2012-08-14 18:13:53 -04:00
Bridger Maxwell
638a5059da
Added stores_state attribute for xmoduledescriptors as a way to declare if the module stores state in the database.
2012-08-07 14:34:05 -04:00
Bridger Maxwell
baa2b14405
Changed interface of StudentModuleCache. Other changes from code review.
2012-08-06 16:36:53 -04:00
Bridger Maxwell
694520ebb2
StudentModuleCache now allows a list of descriptors. This speeds up grading significantly.
2012-08-03 17:00:04 -04:00
Calen Pennington
1d1a9173a4
Cleaning up pep8 violations
2012-07-23 14:44:40 -04:00
Calen Pennington
1263d82d06
Add comments on StudentModuleCache arguments
2012-07-11 22:19:34 -04:00
Calen Pennington
3cf29af8fe
Make location into a named tuple, and use it more as a first class entity, rather than URL for identifying content
2012-07-02 10:17:59 -04:00
Calen Pennington
23195e9d76
Make user profiles work again after the switch to an XMLModuleStore. Staff user histograms are still broken
2012-06-29 12:45:17 -04:00
Calen Pennington
de07b8b345
Begin using a Keystore for XML parsing. Still broken: sequence icons, custom tags, problems, video js
2012-06-29 12:40:50 -04:00
Calen Pennington
5ba03130aa
Moving LMS code into subdirectory
2012-06-06 14:09:01 -04:00
