Will Daly 2436d59e14 Merge branch 'master' into feature/deena/testing ...

Conflicts:
	cms/djangoapps/contentstore/tests/factories.py
	lms/djangoapps/courseware/tests/test_access.py

2013-03-04 16:30:41 -05:00

..

branding

Allow for branding subdomains that are longer than a single .

2012-10-11 13:18:27 -04:00

certificates

Pep8 autofixes

2013-02-06 11:13:50 -05:00

circuit

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

course_wiki

We no longer need override_settings, Django has a better one.

2013-02-11 17:06:35 -05:00

courseware

Merge branch 'master' into feature/deena/testing

2013-03-04 16:30:41 -05:00

dashboard

Cleaned up admin_dashboard code and template

2013-02-28 11:11:57 -05:00

django_comment_client

clean up commments

2013-03-01 16:43:55 -05:00

foldit

Better logging, and make view csrf exempt...

2013-02-14 14:50:18 -05:00

instructor

Taking Ike's delete-student-state-for-problem code and putting it in a separate PR so it's not bundled with more debated features.

2013-02-27 11:42:06 -05:00

licenses

Pep8 autofixes

2013-02-06 11:13:50 -05:00

lms_migration

Pep8 autofixes

2013-02-06 11:13:50 -05:00

multicourse

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

open_ended_grading

Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed

2013-02-20 16:49:59 -05:00

psychometrics

Pep8 autofixes

2013-02-06 11:13:50 -05:00

simplewiki

Pep8 autofixes

2013-02-06 11:13:50 -05:00

static_template_view

Pep8 autofixes

2013-02-06 11:13:50 -05:00

staticbook

get chapter links to start working

2013-02-25 16:52:32 -05:00