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

..

djangoapps

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

envs

fix edit conflict

2012-11-26 09:36:59 -05:00

lib

Merge pull request #731 from MITx/feature/ichuang/symmath_improvements

2012-09-25 19:36:02 -07:00

static

Merge branch 'course-info' into feature/dhm/cms-settings

2012-11-19 16:00:27 -05:00

templates

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

2012-12-11 10:55:10 -05:00

__init__.py

…

.coveragerc

Make coverage reports only include code from the source directories

2012-11-08 12:25:12 -05:00

CHANGELOG.md

Add comment about the target of change log entries

2012-10-30 16:48:47 -04:00

urls.py

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

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

wsgi.py

Add a wsgi file for the lms that loads the modulestores immediately after the application starts

2012-08-28 12:01:05 -04:00