Julian Arni 0a47f27fa7 Merge branch 'master' into feature/jkarni/foldit-api

2013-02-25 17:32:30 -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 pull request #1489 from MITx/feature/vik/settings-to-xmodule

2013-02-20 08:06:20 -08:00

dashboard

Pep8 autofixes

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

django_comment_client

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

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

foldit

Foldit with puzzle leaderboard

2013-02-25 11:16:37 -05:00

instructor

Merge pull request #1466 from MITx/feature/ichuang/fix-idashboard-error-message

2013-02-19 11:08:21 -08: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

Pep8 autofixes

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