Calen Pennington 0fff578e7d Merge remote-tracking branch 'origin/master' into feature/cale/cms-master ...

Conflicts:
	.gitmodules
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/course.scss
	lms/urls.py

2012-11-16 09:03:15 -05:00

..

cache_toolbox

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

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

django_future

Cleaning up pep8 violations

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

external_auth

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-10-23 13:38:11 -04:00

heartbeat

Add heartbeat to cms

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

mitxmako

lots of tweeks to better support importing of existing courseware

2012-10-30 11:52:31 -04: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

Batch together alter statements to minimize how long we lock the auth_users table

2012-11-15 14:55:21 -05:00

track

add admin interface for tracking logs

2012-09-08 10:30:18 -04:00

util

Merge pull request #751 from MITx/cdodge/meta-data-cms-editing

2012-09-25 06:16:51 -07:00

static_replace.py

lots of tweeks to better support importing of existing courseware

2012-10-30 11:52:31 -04:00

xmodule_modifiers.py

removed unneeded trace log. Also don't need StudentModuleCache in 'about' section rendering

2012-10-30 16:04:51 -04:00