Don Mitchell 0a91a98dd0 Merge remote-tracking branch 'origin/feature/cale/cms-master' into ...

feature/dhm/cms-settings

Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/course_info.js
	cms/static/js/template_loader.js
	cms/static/js/views/course_info_edit.js
	cms/templates/base.html
	cms/templates/course_info.html
	cms/urls.py

2012-12-11 10:55:10 -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

models

Moved settings models from common to cms

2012-11-30 10:42:23 -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

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

2012-11-19 10:30:22 -05:00

track

add admin interface for tracking logs

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

util

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

2012-12-11 10:55:10 -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

made a special 'module preview' view for Static Tabs in the CMS. Per Tom, he'd like just the Display Name to show up in the static tab editor until the end-user clicks the Edit button

2012-11-26 14:22:13 -05:00