Jay Zoldak ed5ad46192 Revert "Revert "fix merge conflict"" ...

This reverts commit 2df3fe9344.

Conflicts:
	common/static/coffee/src/discussion/utils.coffee

2013-05-16 10:29:33 -04:00

..

branding

Allow for branding subdomains that are longer than a single .

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

certificates

optimize db round trips, by getting the course descriptor outside of the user loop

2013-04-01 14:02:54 -04:00

circuit

Make relative imports explicitly relative

2013-03-15 11:23:22 -04:00

course_wiki

add fixes for 500 bugs (lighthouse 287 and 293) by requiring login for accessing licenses and inline discussions. Add unit tests for licenses, and rearrange tests based off of (the former) PageLoad. Also cleanups for pylint and pep8.

2013-03-27 17:59:56 -04:00

courseware

fix broken tests. Also drive by fix for the sporadic failure on tests which may go to a textbook page. The URL formatting was incorrect in the test

2013-05-15 11:16:47 -04:00

dashboard

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

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

django_comment_client

Revert "Revert "fix merge conflict""

2013-05-16 10:29:33 -04:00

foldit

Fixed score order.

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

instructor

Modify UserFactory to create a profile for the user

2013-05-03 10:31:35 -04:00

licenses

Consolidate and upgrade factories

2013-04-18 15:11:10 -04:00

lms_migration

fix lms migration to be compatible with xblock

2013-03-31 12:35:08 +00:00

multicourse

Use 'is None' and 'is not None'

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

open_ended_grading

Json updates

2013-05-13 12:49:01 -04:00

psychometrics

pep8 fixes for psychoanalyze and capa module

2013-04-04 09:57:19 -04:00

simplewiki

Making linters happier

2013-05-03 15:08:28 -04:00

static_template_view

press releases: more explicitly match on slug (safety)

2013-04-10 08:20:30 -04:00

staticbook

remove code for supporting anchor_id on html textbooks, since it doesn't work

2013-04-12 11:53:06 -04:00