Calen Pennington 31a070d480 Merge remote-tracking branch 'edx/release' into merge-release-2014-03-10 ...

Conflicts:
	cms/envs/common.py
	lms/envs/common.py

2014-03-10 16:21:08 -04:00

..

djangoapps

Refactored permissions check for course_wiki pages.

2014-03-10 16:13:17 +05:00

envs

Merge remote-tracking branch 'edx/release' into merge-release-2014-03-10

2014-03-10 16:21:08 -04:00

lib

Add tests and clean up A/B testing

2014-03-05 13:46:03 -05:00

static

Minor changes to instructor Analytics tab

2014-03-07 14:44:21 -05:00

templates

Minor changes to instructor Analytics tab

2014-03-08 08:51:36 -05:00

__init__.py

…

.coveragerc

…

startup.py

Add common/djangoapps/third_party_auth; update pylintrc to allow test_* names.

2014-03-06 17:20:58 -08:00

urls.py

Add common/djangoapps/third_party_auth; update pylintrc to allow test_* names.

2014-03-06 17:20:58 -08:00

wsgi_apache_lms.py

apache lms wsgi fix

2013-09-16 21:46:57 -07:00

wsgi.py

Remove extraneous configuration

2014-02-04 15:35:26 -05:00