Calen Pennington
76055aa211
Add a manage.py command that understands the extra edX options
2013-07-24 09:04:12 -04:00
Vik Paruchuri
915f815c63
Merge remote-tracking branch 'origin/master' into fix/vik/studio-oe
...
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_module.py
2013-07-18 11:55:37 -04:00
Don Mitchell
3722685e1a
No longer persist XModule templates
...
Instead, we use XModule field default values when creating an empty
XModule. Driven by this use case, we also allow for XModules to be
created in memory without being persisted to the database at all. This
necessitates a change to the Modulestore api, replacing clone_item with
create_draft and save_xmodule.
2013-07-16 14:33:58 -04:00
Vik Paruchuri
d710d8e43a
Merge remote-tracking branch 'origin/master' into fix/vik/studio-oe
2013-07-11 10:52:50 -04:00
Vik Paruchuri
b38a36d44a
Fix test
2013-06-28 14:38:13 -04:00
Vik Paruchuri
8164ca9a78
Merge remote-tracking branch 'origin/master' into fix/vik/studio-oe
2013-06-27 16:11:24 -04:00
Jean Manuel Nater
1b94050ef6
Merge branch 'master' into jnater/courseware_tests
...
Conflicts:
lms/djangoapps/open_ended_grading/tests.py
2013-06-21 16:38:31 -04:00
Jean Manuel Nater
9bfddd4891
Addressed pull request feedback.
2013-06-21 14:05:57 -04:00
Ned Batchelder
3eec09b87a
Merge pull request #216 from edx/ned/remove-unused-imports
...
Ned/remove unused imports
2013-06-20 14:15:31 -07:00
Calen Pennington
308fe26b65
Clean up pep8 E128 issues
2013-06-20 09:08:25 -04:00
Ned Batchelder
61b53713d2
Remove unused imports from lms, as detected by pylint.
2013-06-19 16:56:34 -04:00
Calen Pennington
82606a062c
Make XModuleDescriptor use __init__ from XBlock
...
Fixes JIRA LMS-203
2013-06-17 13:38:57 -04:00
Vik Paruchuri
cd49e1bb68
Check to see if a location is valid before displaying it for instructor grading
2013-06-13 16:00:28 -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
e9f05640f8
Update comments
2013-05-22 12:16:23 -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
Vik Paruchuri
6dfc490fc7
Json updates
2013-05-13 12:49:01 -04:00
Vik Paruchuri
fd46ebd1fa
Move some functions, make notification tests more robust
2013-05-08 19:04:07 -04:00
Vik Paruchuri
1398b55713
Comment touched modules
2013-05-07 15:48:19 -04:00
Vik Paruchuri
258aebed20
Fix anonymoususer 500 error
2013-05-07 12:58:49 -04:00
Vik Paruchuri
d82ac2b747
Merge remote-tracking branch 'origin/master' into fix/vik/sa-and-coe
2013-04-16 13:45:46 -04:00
Vik Paruchuri
701bdc55c0
Minor fixes
2013-04-16 11:55:54 -04:00
Vik Paruchuri
0d4b9d26cf
Add in a test, rescale preview images
2013-04-16 10:51:23 -04:00
Vik Paruchuri
9cca3072c3
Fix skip behavior for staff
2013-04-09 13:53:51 -04:00
Calen Pennington
63b5153cde
Clean up violations from ichuang's PR
2013-04-08 15:08:23 -04:00
Brian Wilson
bb7bc88847
merge out from master
2013-03-27 18:04:58 -04:00
Brian Wilson
99778b1b5b
add fixes for 500 bugs (lighthouse 287 and 293) by requiring login for accessing licenses and inline discussions. Add unit tests for licenses, and rearrange tests based off of (the former) PageLoad. Also cleanups for pylint and pep8.
2013-03-27 17:59:56 -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
6b64b4214f
Make relative imports explicitly relative
2013-03-15 11:23:22 -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
Vik Paruchuri
b5786874ab
Wiring through some changes
2013-03-04 18:04:13 -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
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
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
Diana Huang
a789d6c363
Merge branch 'master' into diana/fix-self-assessment-test
2013-02-20 13:37:42 -05:00
Diana Huang
6e453c2b8b
Clean up and fix some peer grading tests.
2013-02-20 13:36:09 -05:00
