Vik Paruchuri bf97a6a9a9 Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-xmodule ...

Conflicts:
	lms/djangoapps/open_ended_grading/peer_grading_service.py

2013-02-04 17:55:55 -05:00

..

cache_toolbox

storing work

2013-01-16 09:53:28 -05:00

contentserver

refactor StaticContent id scheme to be the same as moduledata. Also expose a new 'get all content for course' which will be needed to support a asset management page.

2012-10-03 09:07:09 -04:00

course_groups

make tests pass with cms config as well as lms

2013-01-28 15:07:44 -05:00

django_future

Cleaning up pep8 violations

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

external_auth

add more test coverage for openid provider.

2013-01-23 04:23:30 -05:00

heartbeat

Add heartbeat to cms

2012-10-11 12:32:23 -04:00

mitxmako

cosmetic cleanup

2012-12-04 13:25:04 -05:00

monitoring

Move libraries that can only be imported in the context of django into common/djangoapps

2012-06-18 13:48:26 -04:00

pipeline_mako

Remove newline from javascript source tags

2012-10-31 16:26:11 -04:00

status

Pass course_id instead of course to get_site_status_msg

2012-10-08 14:06:58 -04:00

student

Merge pull request #1382 from MITx/feature/brian/pearson-status

2013-01-30 09:55:45 -08:00

track

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

util

New style base python classes and basestring type.

2013-01-22 11:30:24 -05:00

__init__.py

Another checkpoint before pull/merge

2012-11-20 11:37:14 -05:00

static_replace.py

make sure when defining the course namespace in the replace url methods that we explicitly state the parameter name. There are some optional parameters and if we don't define the parameter name, it'll end put being interpreted as a different parameter

2012-11-29 15:56:03 -05:00

xmodule_modifiers.py

Make peer grading xmodule work with notifications

2013-02-04 13:16:05 -05:00