Vik Paruchuri 687ab3ddae Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui ...

Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	lms/templates/combinedopenended/combined_open_ended.html
	lms/templates/combinedopenended/combined_open_ended_status.html
	lms/templates/combinedopenended/openended/open_ended.html
	lms/templates/combinedopenended/openended/open_ended_rubric.html
	lms/templates/combinedopenended/selfassessment/self_assessment_prompt.html

2013-08-08 19:03:46 -04:00

..

calc

Convert many byte strings to unicode; change string formatting

2013-06-20 11:46:04 -04:00

capa

convert all datetime.now() to datetime.now(UTC)

2013-07-22 17:39:11 -04:00

chem

Remove unused imports from common, as reported by pylint.

2013-06-19 16:56:34 -04:00

sandbox-packages

Move loncapa grading helpers into the sandbox-packages directory.

2013-05-31 12:01:33 -04:00

symmath

Pylint complains if you use string, even if you use it for what its still meant to be used for.

2013-06-21 16:35:47 -04:00

xmodule

Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui

2013-08-08 19:03:46 -04:00

logsettings.py

Revert logsettings

2013-02-11 19:21:22 -05:00

rooted_paths.py

Sort the css and js assets by numerical index

2013-04-29 07:31:48 -04:00

sample-post.py

add warning message to sample-post.py

2013-02-06 18:57:25 -05:00

supertrace.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

tempdir.py

Make sure temp directories are properly cleaned up so running tests doesn't leave them behind.

2013-02-21 11:38:45 -05:00