Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,365 Commits 1 Branch 0 Tags
2c83dc3f09b49d740407daaffe05ab8fd549ed8a
Commit Graph

99 Commits

Author SHA1 Message Date
Sarina Canelake
2aea261d48 Merge branch 'release' 
Conflicts:
	common/djangoapps/course_modes/views.py
	common/djangoapps/student/tests/test_roles.py
	common/djangoapps/student/views.py
	common/lib/opaque_keys/opaque_keys/__init__.py
	common/lib/opaque_keys/opaque_keys/tests/test_opaque_keys.py
	common/lib/xmodule/xmodule/contentstore/mongo.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/notes/views.py
 2014-06-10 16:59:23 -04:00
Sarina Canelake
a9cad6a5bb Fix logging bug in openended grading 2014-06-09 15:16:18 -04:00
Calen Pennington
cfcbdc0145 Move to OpaqueKey implementations from the external library 
[LMS-2757]
 2014-05-29 17:03:35 -04:00
Don Mitchell
08aaa97bfb Serialize course_key at last possible code junction 2014-05-20 11:58:03 -04:00
Don Mitchell
bf8ca487bb fix staff_grading server error 2014-05-12 16:25:27 -04:00
Calen Pennington
cd746bf8e5 Make course ids and usage ids opaque to LMS and Studio [partial commit] 
This commit adds the non-courseware lms/djangoapps and lms/lib.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
 2014-05-08 12:09:23 -04:00
Calen Pennington
6c06b39b3f Centralize when json parsing of responses from controller_query_service happens 2014-04-01 10:10:54 -04:00
Don Mitchell
81a92e4bfc Consolidate course_id triple parsing 2014-02-24 11:45:59 -05:00
cahrens
df09e99ad1 Create explicit Locations. 
Part of STUD-1030
 2013-12-12 14:37:00 -05:00
David Baumgold
8eff442752 mitxmako => edxmako 2013-12-03 14:15:09 -05:00
Vik Paruchuri
9a6ae8f740 Clean up open ended problems view and fix error. 2013-09-27 16:02:12 -04:00
Calen Pennington
9643fd463f Rename xblock_field_data to xmodule_field_data 2013-09-18 10:49:41 -04:00
Giulio Gratta
d4687aa6df 4 OE/ORA UI fixes to make it easier to use 
- require confirmation when clicking Open Ended reset button (now working)
- require confirmation when submitting Open Ended essay (now working)
- disable text feedback area during calibration and let users know that they should give feedback when grading
- fixed error message typos
 2013-09-17 16:13:36 -07:00
Jason Bau
706b386a57 Revert "4 OE/ORA UI fixes to make it easier to use" 
This reverts commit 3b29d6056e.
 2013-09-16 20:22:18 -07:00
Giulio Gratta
3b29d6056e 4 OE/ORA UI fixes to make it easier to use 
- require confirmation when clicking Open Ended reset button
- require confirmation when submitting Open Ended essay
- disable text feedback area during calibration and let users know that they should give feedback when grading
- fixed error message typos
 2013-09-16 10:27:13 -07:00
Vik Paruchuri
009017fe07 Address review comments 2013-09-13 11:06:40 -04:00
Vik Paruchuri
b222e66f45 Fix nopathtoitem error in peer grading 2013-09-13 11:06:23 -04:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
Vik Paruchuri
8164ca9a78 Merge remote-tracking branch 'origin/master' into fix/vik/studio-oe 2013-06-27 16:11:24 -04:00
Ned Batchelder
61b53713d2 Remove unused imports from lms, as detected by pylint. 2013-06-19 16:56:34 -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
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