lapentab b9ca9a84d7 Merge branch 'master' into blapenta/fix-test-coverage ...

Conflicts:
	AUTHORS
	common/lib/xmodule/xmodule/tests/test_annotatable_module.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_conditional.py
	common/lib/xmodule/xmodule/tests/test_html_module.py
	common/lib/xmodule/xmodule/tests/test_progress.py
	common/lib/xmodule/xmodule/tests/test_xml_module.py
	lms/djangoapps/courseware/tests/__init__.py

2013-06-18 13:41:53 -04:00

..

branding

Redirect from LMS courses page to marketing courses page

2013-05-07 13:06:38 -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

Merge branch 'master' into blapenta/fix-test-coverage

2013-06-18 13:41:53 -04:00

dashboard

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

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

debug

Print the full traceback when execution fails.

2013-05-06 11:39:17 -04:00

django_comment_client

change form of making datetime.max aware (in UTC)

2013-06-17 16:11:35 -07:00

foldit

Move tz_aware into connection config rather than settings.

2013-06-10 17:16:35 -04:00

instructor

Merge pull request #66 from edx/feature-dcadams-usermanagement

2013-06-10 10:10:57 -07:00

licenses

Consolidate and upgrade factories

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

lms_migration

Move tz_aware into connection config rather than settings.

2013-06-10 17:16:35 -04:00

multicourse

Use 'is None' and 'is not None'

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

notes

actually needs to be 255 given unicode requirements

2013-05-20 14:40:05 -04:00

open_ended_grading

Make XModuleDescriptor use __init__ from XBlock

2013-06-17 13:38:57 -04:00

psychometrics

Move tz_aware into connection config rather than settings.

2013-06-10 17:16:35 -04:00

simplewiki

Move tz_aware into connection config rather than settings.

2013-06-10 17:16:35 -04:00

static_template_view

press releases: more explicitly match on slug (safety)

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

staticbook

modified the html static book to only enable annotator.js when notes are enabled for the course

2013-05-06 19:29:44 -04:00