Ned Batchelder
|
61b53713d2
|
Remove unused imports from lms, as detected by pylint.
|
2013-06-19 16:56:34 -04:00 |
|
Vik Paruchuri
|
badd3a8d13
|
Properly stub out the controller_qs variable in the tested module. Test times out without this.
|
2013-05-31 13:14:19 -04:00 |
|
Vik Paruchuri
|
96f145b8f6
|
Update error message
|
2013-05-22 12:00:36 -04:00 |
|
Vik Paruchuri
|
3bd04290f5
|
Add tests, address review comments
|
2013-05-22 11:58:03 -04:00 |
|
Vik Paruchuri
|
a44eacd474
|
Make fields stringy, remove false dict
|
2013-05-22 10:54:52 -04:00 |
|
Vik Paruchuri
|
21f7e222f7
|
Fix exception clause
|
2013-05-22 10:51:11 -04:00 |
|
Vik Paruchuri
|
c5f9d94cc4
|
Add in comments, fix behavior
|
2013-05-21 14:46:22 -04:00 |
|
Vik Paruchuri
|
c91fa2f45a
|
Add in some comments
|
2013-05-21 14:23:24 -04:00 |
|
Vik Paruchuri
|
956669de21
|
If location cannot be found, move on
|
2013-05-21 14:21:46 -04:00 |
|
Vik Paruchuri
|
0887383ca7
|
Don't show peer grading button unless there is a peer grading element in the course
|
2013-05-21 14:18:00 -04:00 |
|
Calen Pennington
|
63b5153cde
|
Clean up violations from ichuang's PR
|
2013-04-08 15:08:23 -04:00 |
|
Vik Paruchuri
|
df935d422d
|
Fix issues with open ended image grading and peer grading centralized module finder.
|
2013-03-26 09:52:26 -04:00 |
|
Calen Pennington
|
531eb80eb2
|
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
Conflicts:
cms/djangoapps/contentstore/tests/test_contentstore.py
cms/djangoapps/contentstore/views.py
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.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/peer_grading_module.py
common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
lms/djangoapps/open_ended_grading/tests.py
|
2013-03-13 12:18:04 -04:00 |
|
Vik Paruchuri
|
554cb752fa
|
Pep8 cleanup
|
2013-03-12 12:20:11 -04: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
|
9475c6edac
|
Address review comments
|
2013-03-05 14:41:08 -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
|
7ee58fb21c
|
Add in a todo
|
2013-03-01 17:09:28 -05:00 |
|
Vik Paruchuri
|
55e19f8227
|
Fix the way that peer grading tab is initialized to make it work with studio
|
2013-03-01 17:02:38 -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
|
59b2f2ccd7
|
Move controller query service to xmodule side to prepare for ETA message displays
|
2013-02-20 16:19:17 -05:00 |
|
Vik Paruchuri
|
59e3647692
|
Add in support for getting and displaying ETA
|
2013-02-20 13:28:37 -05:00 |
|
Vik Paruchuri
|
6a10ffc7da
|
Fix up error messages to staff and students
|
2013-02-13 19:12:16 -05:00 |
|
Vik Paruchuri
|
8f7c145957
|
Remove old import statements
|
2013-02-13 09:45:29 -05:00 |
|
Vik Paruchuri
|
b9bf96520e
|
Move open ended grading xmodule support files into a separate directory. apparently prune down on number of imports
|
2013-02-11 18:43:47 -05:00 |
|
Vik Paruchuri
|
9bca4ebf21
|
Start to refactor grading settings
|
2013-02-11 17:32:11 -05:00 |
|
Calen Pennington
|
cfae1cdf62
|
Pep8 autofixes
|
2013-02-06 11:13:50 -05:00 |
|
Vik Paruchuri
|
134f2f7af7
|
Fix tests, bugfix for problem url error
|
2013-02-05 14:21:08 -05:00 |
|
Vik Paruchuri
|
e13de7543f
|
Test fixes, err response fixes, address review comments
|
2013-02-05 14:12:11 -05:00 |
|
Vik Paruchuri
|
34dc6e6320
|
Fix some issues with peer grading service
|
2013-02-05 13:37:55 -05:00 |
|
Vik Paruchuri
|
7984c4dfcb
|
Move over grading service to xmodule
|
2013-02-05 13:10:56 -05:00 |
|
Vik Paruchuri
|
18814196f0
|
Make things slightly robust
|
2013-02-04 18:31:32 -05:00 |
|
Vik Paruchuri
|
bf97a6a9a9
|
Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-xmodule
Conflicts:
lms/djangoapps/open_ended_grading/peer_grading_service.py
|
2013-02-04 17:55:55 -05:00 |
|
Vik Paruchuri
|
7f96fbb3d1
|
Address review comments
|
2013-02-04 17:15:07 -05:00 |
|
Vik Paruchuri
|
c4c674367f
|
Remove unneccesary imports
|
2013-02-04 16:54:36 -05:00 |
|
Vik Paruchuri
|
6cf2742e32
|
Trim unneeded files
|
2013-02-04 14:22:57 -05:00 |
|
Vik Paruchuri
|
43ddf1fbcf
|
Proper redirect behavior
|
2013-02-04 14:14:15 -05:00 |
|
Vik Paruchuri
|
14676d1c32
|
Untrack dev.py, add in redirect code for peer grading
|
2013-02-04 14:05:02 -05:00 |
|
Vik Paruchuri
|
3380745692
|
About to trim some lines
|
2013-02-04 13:54:27 -05:00 |
|
Vik Paruchuri
|
c6c89e4216
|
Make peer grading xmodule work with notifications
|
2013-02-04 13:16:05 -05:00 |
|
Vik Paruchuri
|
7263cbfcca
|
Fixes to make peer grading show up in notifications
|
2013-02-04 12:41:14 -05:00 |
|
Vik Paruchuri
|
f742b7d865
|
Start to integrate peer grading xmodule back into notifications
|
2013-02-04 12:07:03 -05:00 |
|
Vik Paruchuri
|
78f9f63466
|
Add in notification type for flagged submissions
|
2013-01-31 11:19:15 -05:00 |
|
Vik Paruchuri
|
b4c80da224
|
Trim whitespace
|
2013-01-30 21:50:24 -05:00 |
|
Vik Paruchuri
|
8e9ec501a7
|
Implement flagging, fix urls
|
2013-01-30 21:44:21 -05:00 |
|
Vik Paruchuri
|
4c16479569
|
Working on frontend JS for posting
|
2013-01-30 21:22:59 -05:00 |
|
Vik Paruchuri
|
17fce100bb
|
Add in ban actions to table
|
2013-01-30 21:10:48 -05:00 |
|
Vik Paruchuri
|
b248a09572
|
Work on adding in ban actions
|
2013-01-30 21:06:54 -05:00 |
|
Vik Paruchuri
|
e89196e0dd
|
Add in flagged problem list return
|
2013-01-30 20:47:00 -05:00 |
|