Kevin Chugh 8d766c4b51 fix conflict

2013-03-13 21:01:37 -04: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

Use 'is None' and 'is not None'

2013-03-04 10:57:25 -05:00

courseware

fix pylint and pep8 warnings

2013-03-12 15:49:48 -04:00

dashboard

Cast cursor responses as lists. MySQL returns them as tuples.

2013-03-04 18:19:24 -05:00

django_comment_client

fix conflict

2013-03-13 21:01:37 -04:00

foldit

Fixed score order.

2013-03-11 14:57:19 -04:00

instructor

Merge pull request #1423 from MITx/feature/jth/remove_un-enroll_all

2013-03-05 10:18:30 -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

Use 'is None' and 'is not None'

2013-03-04 10:57:25 -05:00

open_ended_grading

Pep8 cleanup

2013-03-12 12:20:11 -04:00

psychometrics

Pep8 autofixes

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

simplewiki

Use 'is None' and 'is not None'

2013-03-04 10:57:25 -05:00

static_template_view

Pep8 autofixes

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

staticbook

add checks that book_index is in range

2013-03-11 11:10:08 -04:00