Calen Pennington 19acdd31e8 Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master ...

Conflicts:
	cms/djangoapps/contentstore/views/public.py
	common/djangoapps/external_auth/tests/test_ssl.py
	common/djangoapps/student/views.py
	lms/djangoapps/dashboard/sysadmin.py
	lms/templates/notes.html

2014-05-12 11:35:03 -04:00

..

safe_exec

Remove dogstatsd-python in favor of dogapi

2013-09-11 19:28:58 -04:00

templates

Merge pull request #3002 from edx/dcs/status-object

2014-04-29 10:35:05 -04:00

tests

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

2014-05-12 11:35:03 -04:00

__init__.py

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

capa_problem.py

allow capa poroblems access to anonymous_student_id

2014-04-22 21:00:01 -04:00

checker.py

Merge pull request #216 from edx/ned/remove-unused-imports

2013-06-20 14:15:31 -07:00

correctmap.py

Unicode changes to support QRF

2014-01-30 16:20:36 -05:00

customrender.py

Multiple-choice features

2014-04-14 15:48:29 -07:00

inputtypes.py

Merge pull request #3002 from edx/dcs/status-object

2014-04-29 10:35:05 -04:00

javascript_problem_generator.js

Provide a reasonable seeding mechanism for jsresponses

2012-09-11 15:09:49 -07:00

javascript_problem_grader.js

Fixing dependency system for javascriptresponses. In particular, adding a location for node-only packages (that are never sent to the client) in lms/lib/node_modules and adding lms/static/js, lms/static/coffee/* to the NODE_PATH, along with the course's data directory.

2012-08-07 03:28:35 -04:00

registry.py

Make a ResponseType registry.

2014-01-16 12:25:28 -05:00

responsetypes.py

Merge pull request #3586 from edx/anton/i18n-custom-response

2014-05-07 15:13:13 +03:00

util.py

Give numerical response tolerance as a range (for example [5,7)) (BLD-25)

2014-01-27 14:58:19 +02:00

xqueue_interface.py

Add timestamp and wait for 35 sec.

2014-04-25 10:26:46 +03:00