ichuang 220ec522a1 Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static ...

Conflicts:
	common/djangoapps/static_replace/__init__.py
	common/djangoapps/xmodule_modifiers.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/module_render.py

2013-08-19 08:24:35 -04:00

..

djangoapps

Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static

2013-08-19 08:24:35 -04:00

envs

Merge pull request #722 from edx/feature/cdodge/add-a-mixed-modulestore

2013-08-17 07:32:51 -07:00

lib

home button working, default to home when no thread selected

2013-07-29 23:33:50 -04:00

static

hide empty management list selector, add explanation text

2013-08-09 14:22:56 -04:00

templates

Merge pull request #657 from edx/zoldak/fix-i18n-enroll

2013-08-14 13:18:00 -07:00

__init__.py

…

.coveragerc

Change coverage report config to reflect refactoring of terrain files

2013-02-20 09:31:50 -05:00

one_time_startup.py

add a set_modulestore_configuration to the modulestore interface. This can be used to pass in settings run the Django tier

2013-08-15 22:56:32 -04:00

urls.py

Rename MITX_SETTING AUTOMATIC_AUTH_FOR_LOAD_TESTING -> AUTOMATIC_AUTH_FOR_TESTING because it will be used for acceptance testing also.

2013-08-08 12:08:25 -04:00

wsgi_apache_lms.py

The bulk of Shibboleth authentication for Stanford

2013-06-19 00:48:18 -07:00

wsgi.py

…

xmodule_namespace.py

add static_asset_path metadata to course, and honor its use in link rewriting

2013-08-12 20:26:20 +00:00