Chris Dodge 3b5e17ef55 Merge branch 'master' into feature/cdodge/cms-master-merge2 ...

Conflicts:
	.gitmodules
	common/djangoapps/__init__.py
	common/djangoapps/track/migrations/__init__.py
	common/lib/capa/capa/inputtypes.py
	common/lib/capa/capa/responsetypes.py
	common/lib/capa/capa/templates/openendedinput.html
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/video_module.py
	common/static/sass/bourbon/css3/_box-sizing.scss
	doc/development.md
	lms/djangoapps/instructor/tests.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/templates/video.html
	requirements.txt
	test-requirements.txt

2013-01-07 12:34:48 -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

cosmetic cleanup

2012-12-04 13:25:04 -05: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

perform a new merge from master, resolve conflicts

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

track

perform a new merge from master, resolve conflicts

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

util

Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge

2013-01-03 10:46: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

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