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

..

analytics

fix pylint violations

2013-08-02 09:53:21 -04:00

branding

creates "edge" case

2013-08-05 18:08:32 -04:00

certificates

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

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

circuit

Remove pointless addition tests

2013-06-27 16:27:39 -04:00

course_wiki

be sure to encode the display strings

2013-08-02 09:56:19 -04:00

courseware

Fixed stylistic things and no longer skipped tests in firefox

2013-08-08 13:24:28 -04:00

dashboard

Remove pointless addition tests

2013-06-27 16:27:39 -04:00

debug

Remove unused imports from lms, as detected by pylint.

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

django_comment_client

address code review comments

2013-07-30 01:55:20 -04:00

foldit

change models to filter by course

2013-07-19 11:03:25 -04:00

instructor

Merge pull request #506 from edx/ksteph/bugfix_offline_gradecalc

2013-08-06 14:53:30 -07:00

instructor_task

No longer persist XModule templates

2013-07-16 14:33:58 -04:00

licenses

Remove unused imports from lms, as detected by pylint.

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

lms_migration

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

multicourse

Remove simplewiki from the codebase

2013-06-20 09:06:29 -04:00

notes

Add a manage.py command that understands the extra edX options

2013-07-24 09:04:12 -04:00

notification_prefs

notification_prefs/views: correct docstring

2013-07-30 02:30:45 -04:00

open_ended_grading

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

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

psychometrics

Change wildcard imports into specific imports

2013-06-21 17:33:06 -04:00

static_template_view

Remove static_template_view tests

2013-07-09 12:54:50 -04:00

staticbook

Add tests for image books, and more tests for the other kinds too.

2013-07-03 14:42:41 -04:00

user_api

make user_api compatible with HTTP basic auth

2013-07-30 17:13:48 -04:00