Vik Paruchuri
7871fce7ff
Merge branch 'feature/vik/fix-oe-storage' into feature/vik/storage-model-fixes
...
Conflicts:
common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
2013-03-06 12:49:11 -05:00
Vik Paruchuri
b75b091581
Remove 2 more debug statements
2013-03-06 12:27:22 -05:00
Calen Pennington
8a9ba79d1f
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
cms/djangoapps/contentstore/views.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
2013-03-06 12:15:07 -05:00
Vik Paruchuri
d20fc439ec
Fix peer grading boolean parsing
2013-03-06 11:47:48 -05:00
Vik Paruchuri
3329af077a
Force instance state to save periodically
2013-03-06 11:29:25 -05:00
Vik Paruchuri
7ea3d70c2c
Caching attribute values from child module
2013-03-06 11:21:42 -05:00
Vik Paruchuri
b7c6f7ca1a
Mostly working state
2013-03-05 19:16:02 -05:00
Vik Paruchuri
0d777a7a0e
Convert to passing in current task state again
2013-03-05 17:53:06 -05:00
Vik Paruchuri
904ed6c80f
Combined open ended renders correctly, but internal state tracking broken
2013-03-05 17:48:39 -05:00
Vik Paruchuri
697e426ce6
Switch to passing through entire task state
2013-03-05 16:58:59 -05:00
Vik Paruchuri
2924bd2f53
wip
2013-03-05 10:20:26 -05:00
Vik Paruchuri
dc7c391454
Converting combined open ended module
2013-03-04 19:14:38 -05:00
Vik Paruchuri
cb4a7c663c
A somewhat working state for notifications. Combined open ended and peer grading xmodules still have significant errors.
2013-03-04 18:54:52 -05: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
Vik Paruchuri
c24ba23e54
Move self assessment templates
2013-03-01 13:45:55 -05:00
Vik Paruchuri
b0c2559de8
Switch around template locations
2013-03-01 13:43:01 -05:00
Vik Paruchuri
b3d0abbd05
Start to move around templates
2013-03-01 13:31:54 -05:00
Diana Huang
ae60661f94
Get previews to work in Studio and use the correct type of editors
...
for these XModules within Studio.
2013-02-25 11:42:06 -05:00
Vik Paruchuri
d5865e70b8
Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages
2013-02-22 10:21:34 -05:00
Diana Huang
9aac915c9f
Remove unnecessary assignment
2013-02-21 10:33:48 -05:00
Diana Huang
3a8b7156a0
Merge branch 'master' into diana/click-tracking
2013-02-21 10:19:35 -05:00
Diana Huang
18a56005b0
Address code review feedback
...
- make category a data field of an input
- namespace event types
- don't try to use the track function when it doesn't exist
- generate event types if it doesn't match a pre-existing pattern
2013-02-21 10:17:08 -05:00
Vik Paruchuri
9d5a08fc6d
Fix location string
2013-02-20 18:07:24 -05:00
Vik Paruchuri
9bc8dbd7ca
Fix location strings, re-order checkboxes
2013-02-20 18:04:25 -05:00
Vik Paruchuri
7b604aa026
Fix an import statement
2013-02-20 17:57:09 -05:00
Vik Paruchuri
43158de9bb
Merge branch 'feature/vik/check-if-submission-allowed' into feature/vik/oe-messages
...
Conflicts:
common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
2013-02-20 17:50:00 -05:00
Vik Paruchuri
912800cabf
Fix location string object problems
2013-02-20 17:27:37 -05:00
Vik Paruchuri
a8fadb0ecc
Remove render to string import
2013-02-20 17:16:38 -05:00
Vik Paruchuri
19a80c6268
Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages
...
Conflicts:
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
2013-02-20 17:12:53 -05:00
Vik Paruchuri
d5ba5457dc
Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed
...
Conflicts:
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
2013-02-20 16:49:59 -05:00
Vik Paruchuri
ad9400a0ef
Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages
...
Conflicts:
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
2013-02-20 16:43:04 -05:00
Vik Paruchuri
26a2e059c8
Actually display ETA message
2013-02-20 16:36:40 -05:00
Vik Paruchuri
111ef30f05
Render to string fix, display ETA message when student submits
2013-02-20 16:30:44 -05:00
Vik Paruchuri
2f29d85efc
Finish function to get eta value
2013-02-20 16:22:22 -05:00
Vik Paruchuri
59b2f2ccd7
Move controller query service to xmodule side to prepare for ETA message displays
2013-02-20 16:19:17 -05:00
Diana Huang
ea13659249
Merge branch 'master' into diana/click-tracking
...
Conflicts:
common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
2013-02-20 14:02:04 -05:00
Diana Huang
a789d6c363
Merge branch 'master' into diana/fix-self-assessment-test
2013-02-20 13:37:42 -05:00
Diana Huang
789db30176
Merge pull request #1520 from MITx/feature/vik/disable-spell-check
...
Feature/vik/disable spell check
2013-02-20 09:45:32 -08:00
Diana Huang
13d4cfa4d4
Merge branch 'master' into diana/click-tracking
2013-02-20 11:40:14 -05:00
Vik Paruchuri
ee3c658f46
Merge remote-tracking branch 'origin/master' into feature/vik/disable-spell-check
2013-02-20 11:39:39 -05:00
Diana Huang
d0bd7466b4
Fix import statement for TimeInfo
2013-02-20 11:22:58 -05:00
Diana Huang
b3767fc553
Merge branch 'master' into feature/diana/close-oe-problems
...
Conflicts:
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
common/lib/xmodule/xmodule/peer_grading_module.py
2013-02-20 11:20:10 -05:00
Vik Paruchuri
72d069825d
Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed
...
Conflicts:
lms/templates/instructor/staff_grading.html
2013-02-19 15:21:09 -05:00
Vik Paruchuri
4d57f1b9ee
Merge remote-tracking branch 'origin/master' into feature/vik/settings-to-xmodule
2013-02-19 10:43:55 -05:00
Vik Paruchuri
44fdc0135a
Remove magic 8 ball grading
2013-02-19 10:43:10 -05:00
Vik Paruchuri
11076e759e
Add who to contact for all staff facing messages
2013-02-13 19:28:30 -05:00
Diana Huang
125e0b2137
Track the names of uploaded images, since we aren't recording
...
that data via the ajax calls.
2013-02-13 17:40:28 -05:00
Vik Paruchuri
1cc5e61507
More fixes on error messages
2013-02-13 16:52:09 -05:00
Diana Huang
943a565717
Log rubric selection clicks
2013-02-13 16:48:58 -05:00
Vik Paruchuri
0627b7b9f2
Fix error messages, document
2013-02-13 16:38:33 -05:00
