Calen Pennington 150b5cd298 Merge pull request #3816 from cpennington/ok-psychometrics ...

Fix PsychometricData query

2014-05-21 16:09:46 -04:00

..

analytics

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-08 12:09:23 -04:00

branding

Fix infinite redirect loop on logout caused by django caching

2014-05-09 14:22:11 -04:00

bulk_email

Address review comments

2014-05-14 09:37:38 -04:00

certificates

Resolve merge conflicts relative to master

2014-05-09 15:31:20 -04:00

circuit

mitxmako => edxmako

2013-12-03 14:15:09 -05:00

class_dashboard

Fix dashboard data tests

2014-05-16 15:38:59 -04:00

course_wiki

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-08 12:09:23 -04:00

courseware

Allow cross course references in the LMS

2014-05-20 11:44:09 -04:00

dashboard

Fix issues with psychometrics and git import

2014-05-16 11:47:14 -04:00

debug

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-08 12:09:23 -04:00

django_comment_client

Update get_discussion_link command to use CourseKeys

2014-05-15 16:41:31 -04:00

foldit

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-08 12:09:23 -04:00

instructor

Merge pull request #3779 from edx/sarina/fix-grades-management-commands

2014-05-20 11:35:54 -04:00

instructor_task

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

2014-05-09 15:29:32 -04:00

licenses

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-08 12:09:23 -04:00

linkedin

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

2014-05-09 15:29:32 -04:00

lms_migration

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-08 12:09:23 -04:00

multicourse

MITX_ROOT_URL => EDX_ROOT_URL

2013-12-04 12:59:35 -05:00

notes

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

2014-05-16 14:01:20 -04:00

notification_prefs

Notifier re-subcribe via link

2014-01-22 09:54:27 -08:00

open_ended_grading

Serialize course_key at last possible code junction

2014-05-20 11:58:03 -04:00

psychometrics

Fix PsychometricData query

2014-05-21 14:48:25 -04:00

shoppingcart

Fix failing tests from merge with master

2014-05-12 11:34:39 -04:00

static_template_view

mitxmako => edxmako

2013-12-03 14:15:09 -05:00

staticbook

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

2014-05-09 15:29:32 -04:00

verify_student

Fix failing tests from merge with master

2014-05-12 11:34:39 -04:00